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

[Thomas Draier]

tdraier     2005/04/21 18:09:29 CEST

  Modified files:
    src/java/org/jahia/update/core PatchSlide2.java 
  Log:
  remove missing files
  
  Revision  Changes    Path
  1.7       +29 -21    
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.6&r2=1.7&f=h
  
  
  
  Index: PatchSlide2.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia_update/src/java/org/jahia/update/core/PatchSlide2.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- PatchSlide2.java  19 Apr 2005 11:14:17 -0000      1.6
  +++ PatchSlide2.java  21 Apr 2005 16:09:29 -0000      1.7
  @@ -75,29 +75,37 @@
                   insertObject.setString(2,classname);
                   insertObject.executeUpdate();
   
  -                String branch = "main";
  -                int currentBranchId;
  -                if (branches.containsKey(slidens+branch)) {
  -                    currentBranchId = 
((Integer)branches.get(slidens+branch)).intValue();
  +                String f;
  +                if (path.endsWith("/")) {
  +                    f = path+slidens+uri;
                   } 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();
  +                    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();
  +                    }
   
  +                    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 ++;
               }
               insertObject.close();