cvs commit: jahia_update/src/java/org/jahia/update/core PatchSlide2b.java

[Thomas Draier]

tdraier     2005/06/10 13:02:45 CEST

  Modified files:
    src/java/org/jahia/update/core PatchSlide2b.java 
  Log:
  update all autoids to max of uri and version_history
  
  Revision  Changes    Path
  1.5       +6 -0      
jahia_update/src/java/org/jahia/update/core/PatchSlide2b.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia_update/src/java/org/jahia/update/core/PatchSlide2b.java.diff?r1=1.4&r2=1.5&f=h
  
  
  
  Index: PatchSlide2b.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia_update/src/java/org/jahia/update/core/PatchSlide2b.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- PatchSlide2b.java 6 Jun 2005 14:51:35 -0000       1.4
  +++ PatchSlide2b.java 10 Jun 2005 11:02:45 -0000      1.5
  @@ -34,6 +34,11 @@
               rs.next();
               int uriId = rs.getInt(1) + 1;
               rs.close();
  +            rs = 
dbManager.selectFromTable("jahia_autoids_currentindex","jahia_autoids WHERE 
jahia_autoids_tablename='JAHIA_SL2_VERSION_HISTORY'");
  +            rs.next();
  +            int versionUriId = rs.getInt(1) + 1;
  +            rs.close();
  +            uriId = Math.max(uriId, versionUriId);
   
               PreparedStatement selectUri = dbManager.prepareStatement("select 
uri_id from jahia_sl2_uri where uri_string=? and namespace=?");
               PreparedStatement insertUri = dbManager.prepareStatement("insert 
into jahia_sl2_uri values(?,?,?)");
  @@ -102,6 +107,7 @@
               insertObject.close();
   
               dbManager.query("update jahia_autoids set 
jahia_autoids_currentindex="+uriId+" where 
jahia_autoids_tablename='JAHIA_SL2_URI'");
  +            dbManager.query("update jahia_autoids set 
jahia_autoids_currentindex="+uriId+" where 
jahia_autoids_tablename='JAHIA_SL2_VERSION_HISTORY'");
   
               PreparedStatement getVersion = 
dbManager.prepareStatement("select * from jahia_sl2_version where uri_id=?");
               PreparedStatement insertVersion = 
dbManager.prepareStatement("insert into jahia_sl2_version values(?,?)");