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

[Thomas Draier]

tdraier     2005/05/26 17:24:51 CEST

  Modified files:
    src/java/org/jahia/update/core PatchSlide2.java 
  Log:
  add properties to default folder - needed for "open ie folder" to work
  
  Revision  Changes    Path
  1.10      +27 -4     
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.9&r2=1.10&f=h
  
  
  
  Index: PatchSlide2.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia_update/src/java/org/jahia/update/core/PatchSlide2.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- PatchSlide2.java  17 May 2005 15:30:12 -0000      1.9
  +++ PatchSlide2.java  26 May 2005 15:24:51 -0000      1.10
  @@ -6,10 +6,7 @@
   import org.jahia.model.jahia4.site.JahiaSite;
   
   import java.sql.*;
  -import java.util.Map;
  -import java.util.HashMap;
  -import java.util.Hashtable;
  -import java.util.Iterator;
  +import java.util.*;
   import java.io.File;
   
   /**
  @@ -233,6 +230,7 @@
   
               PreparedStatement insertProperty = 
dbManager.prepareStatement("insert into jahia_sl2_properties 
values(?,?,?,?,?,?)");
   
  +            Set objectsWithProperties = new HashSet();
               rs = dbManager.selectFromTable("*", "jahia_slide_property");
               while (rs.next()) {
                   String uri = rs.getString(1);
  @@ -245,6 +243,7 @@
                   String slidens = rs.getString(8);
   
                   if (objects.containsKey(slidens+uri)) {
  +                    objectsWithProperties.add(slidens+uri);
                       int id = ((Integer)objects.get(slidens+uri)).intValue();
   
                       if ("displayname".equals(propName) && (value != null)) {
  @@ -262,6 +261,30 @@
                       insertProperty.executeUpdate();
                   }
               }
  +
  +            Set noProps = new HashSet(objects.keySet());
  +            noProps.removeAll(objectsWithProperties);
  +            for (Iterator iterator = noProps.iterator(); 
iterator.hasNext();) {
  +                String k = (String) iterator.next();
  +                int id = ((Integer)objects.get(k)).intValue();
  +
  +                insertProperty.setInt(1,id);
  +                insertProperty.setString(2,"DAV:");
  +                insertProperty.setString(5,"");
  +                insertProperty.setInt(6,1);
  +
  +                insertProperty.setString(3,"resourcetype");
  +                insertProperty.setString(4,"<collection/>");
  +                insertProperty.executeUpdate();
  +
  +                insertProperty.setString(3,"getcontentlength");
  +                insertProperty.setString(4,"0");
  +                insertProperty.executeUpdate();
  +
  +                insertProperty.setString(3,"source");
  +                insertProperty.setString(4,"");
  +                insertProperty.executeUpdate();
  +            }
               insertProperty.close();
   
               dbManager.query("insert into jahia_autoids 
values('JAHIA_SL2_URI',"+uriId+")");