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

[Thomas Draier]

tdraier     2005/05/26 18:15:57 CEST

  Modified files:
    src/java/org/jahia/update/core PatchSlide2.java 
  Log:
  add version history for all files
  
  Revision  Changes    Path
  1.11      +21 -23    
jahia_update/src/java/org/jahia/update/core/PatchSlide2.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia_update/src/java/org/jahia/update/core/PatchSlide2.java.diff?r1=1.10&r2=1.11&f=h
  
  
  
  Index: PatchSlide2.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia_update/src/java/org/jahia/update/core/PatchSlide2.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- PatchSlide2.java  26 May 2005 15:24:51 -0000      1.10
  +++ PatchSlide2.java  26 May 2005 16:15:57 -0000      1.11
  @@ -78,31 +78,29 @@
                   } else {
                       f = path+"/"+slidens+uri;                    
                   }
  -                if ((new File(f).exists() && new File(f).isDirectory()) || 
(new File(f+"_1.0").exists() && !new File(f).isDirectory())) {
  -                    String branch = "main";
  -                    int currentBranchId;
  -                    if (branches.containsKey(slidens+branch)) {
  -                        currentBranchId = 
((Integer)branches.get(slidens+branch)).intValue();
  -                    } else {
  -                        currentBranchId = branchId++;
  -                        branches.put(slidens+branch, new 
Integer(currentBranchId));
  -                        insertBranch.setInt(1, currentBranchId);
  -                        insertBranch.setString(2, branch);
  -                        insertBranch.setInt(3, nsId);
  -                        insertBranch.executeUpdate();
  -                    }
  +                String branch = "main";
  +                int currentBranchId;
  +                if (branches.containsKey(slidens+branch)) {
  +                    currentBranchId = 
((Integer)branches.get(slidens+branch)).intValue();
  +                } else {
  +                    currentBranchId = branchId++;
  +                    branches.put(slidens+branch, new 
Integer(currentBranchId));
  +                    insertBranch.setInt(1, currentBranchId);
  +                    insertBranch.setString(2, branch);
  +                    insertBranch.setInt(3, nsId);
  +                    insertBranch.executeUpdate();
  +                }
   
  -                    insertVersion.setInt(1,uriId);
  -                    insertVersion.setInt(2,0);
  -                    insertVersion.executeUpdate();
  -
  -                    insertVersionHistory.setInt(1,uriId);
  -                    insertVersionHistory.setInt(2,uriId);
  -                    insertVersionHistory.setInt(3,currentBranchId);
  -                    insertVersionHistory.setString(4,"1.0");
  -                    insertVersionHistory.executeUpdate();
  +                insertVersion.setInt(1,uriId);
  +                insertVersion.setInt(2,0);
  +                insertVersion.executeUpdate();
  +
  +                insertVersionHistory.setInt(1,uriId);
  +                insertVersionHistory.setInt(2,uriId);
  +                insertVersionHistory.setInt(3,currentBranchId);
  +                insertVersionHistory.setString(4,"1.0");
  +                insertVersionHistory.executeUpdate();
   
  -                }
                   uriId ++;
               }