tdraier 2005/05/17 17:30:12 CEST
Modified files:
src/java/org/jahia/update/core PatchSlide2.java
Log:
fixed an issue with migration of some files in user folders, which were not
listed
Revision Changes Path
1.9 +24 -6
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.8&r2=1.9&f=h
Index: PatchSlide2.java
===================================================================
RCS file:
/home/cvs/repository/jahia_update/src/java/org/jahia/update/core/PatchSlide2.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- PatchSlide2.java 2 May 2005 13:49:22 -0000 1.8
+++ PatchSlide2.java 17 May 2005 15:30:12 -0000 1.9
@@ -108,10 +108,6 @@
}
uriId ++;
}
- insertObject.close();
- insertVersion.close();
- insertVersionHistory.close();
- insertBranch.close();
PreparedStatement insertBinding =
dbManager.prepareStatement("insert into jahia_sl2_binding values(?,?,?)");
PreparedStatement insertParentBinding =
dbManager.prepareStatement("insert into jahia_sl2_parent_binding
values(?,?,?)");
@@ -121,7 +117,24 @@
String uri = rs.getString(1);
String childUri = rs.getString(2);
String slidens = rs.getString(3);
- if (objects.containsKey(slidens+uri) &&
objects.containsKey(slidens+childUri)) {
+ if (objects.containsKey(slidens+childUri)) {
+ if (!objects.containsKey(slidens+uri)) {
+ JahiaSite siteByKey = (JahiaSite) sites.get(slidens);
+ if (siteByKey == null) {
+ continue;
+ }
+ int nsId = siteByKey.getId();
+ insertUri.setInt(1,uriId);
+ insertUri.setString(2, uri);
+ insertUri.setInt(3, nsId);
+ insertUri.executeUpdate();
+ objects.put(slidens+uri, new Integer(uriId));
+
+ insertObject.setInt(1,uriId);
+
insertObject.setString(2,"org.apache.slide.structure.SubjectNode");
+ insertObject.executeUpdate();
+ uriId ++;
+ }
int parentId =
((Integer)objects.get(slidens+uri)).intValue();
int childId =
((Integer)objects.get(slidens+childUri)).intValue();
String name =
childUri.substring(childUri.lastIndexOf("/")+1);
@@ -139,6 +152,11 @@
insertBinding.close();
insertParentBinding.close();
+ insertObject.close();
+ insertVersion.close();
+ insertVersionHistory.close();
+ insertBranch.close();
+
PreparedStatement insertLink =
dbManager.prepareStatement("insert into jahia_sl2_links values(?,?)");
rs = dbManager.selectFromTable("*", "jahia_slide_links");
@@ -161,7 +179,7 @@
PreparedStatement insertPermission =
dbManager.prepareStatement("insert into jahia_sl2_permissions
values(?,?,?,?,?,?,?)");
- PreparedStatement getSucc = dbManager.prepareStatement("select
max(p.SUCCESSION) from JAHIA_SL2_PERMISSIONS p where p.OBJECT_ID = ?");
+ PreparedStatement getSucc = dbManager.prepareStatement("select
max(p.succession) from jahia_sl2_permissions p where p.object_id = ?");
rs = dbManager.selectFromTable("*", "jahia_slide_permissions");
while (rs.next()) {
