tdraier 2005/05/31 17:01:32 CEST
Modified files:
src/java/org/jahia/update/core PatchSlide2b.java
Log:
add version history and properties for all files, add missing binding and
recreate missing entries in uri/objects
Revision Changes Path
1.2 +85 -17
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.1&r2=1.2&f=h
Index: PatchSlide2b.java
===================================================================
RCS file:
/home/cvs/repository/jahia_update/src/java/org/jahia/update/core/PatchSlide2b.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PatchSlide2b.java 19 May 2005 16:25:01 -0000 1.1
+++ PatchSlide2b.java 31 May 2005 15:01:31 -0000 1.2
@@ -30,9 +30,14 @@
try {
dbManager = DBManager.getInstance();
- ResultSet rs;
+ ResultSet rs =
dbManager.selectFromTable("jahia_autoids_currentindex","jahia_autoids WHERE
jahia_autoids_tablename='JAHIA_SL2_URI'");
+ rs.next();
+ int uriId = rs.getInt(1);
+ rs.close();
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(?,?,?)");
+ PreparedStatement insertObject =
dbManager.prepareStatement("insert into jahia_sl2_object values(?,?)");
PreparedStatement selectBinding =
dbManager.prepareStatement("select * from jahia_sl2_binding where uri_id=? and
child_uuri_id=?");
PreparedStatement insertBinding =
dbManager.prepareStatement("insert into jahia_sl2_binding values(?,?,?)");
PreparedStatement insertParentBinding =
dbManager.prepareStatement("insert into jahia_sl2_parent_binding
values(?,?,?)");
@@ -53,24 +58,34 @@
selectUri.setString(1, parent);
selectUri.setInt(2, ns);
ResultSet rs2 = selectUri.executeQuery();
+ int parentid;
if (rs2.next()) {
- int parentid = rs2.getInt(1);
- rs2.close();
+ parentid = rs2.getInt(1);
+ } else {
+ parentid = uriId++;
+ insertUri.setInt(1,parentid);
+ insertUri.setString(2,parent);
+ insertUri.setInt(3,ns);
+ insertUri.executeUpdate();
+ insertObject.setInt(1,parentid);
+
insertObject.setString(2,"org.apache.slide.structure.SubjectNode");
+ insertObject.executeUpdate();
+ }
+ rs2.close();
- selectBinding.setInt(1, parentid);
- selectBinding.setInt(2, id);
- rs2 = selectBinding.executeQuery();
- if (!rs2.next()) {
- insertBinding.setInt(1,parentid);
- insertBinding.setString(2,child);
- insertBinding.setInt(3,id);
- insertBinding.executeUpdate();
-
- insertParentBinding.setInt(1,id);
- insertParentBinding.setString(2,child);
- insertParentBinding.setInt(3,parentid);
- insertParentBinding.executeUpdate();
- }
+ selectBinding.setInt(1, parentid);
+ selectBinding.setInt(2, id);
+ rs2 = selectBinding.executeQuery();
+ if (!rs2.next()) {
+ insertBinding.setInt(1,parentid);
+ insertBinding.setString(2,child);
+ insertBinding.setInt(3,id);
+ insertBinding.executeUpdate();
+
+ insertParentBinding.setInt(1,id);
+ insertParentBinding.setString(2,child);
+ insertParentBinding.setInt(3,parentid);
+ insertParentBinding.executeUpdate();
}
rs2.close();
}
@@ -83,6 +98,59 @@
insertBinding.close();
selectBinding.close();
selectUri.close();
+ insertUri.close();
+ insertObject.close();
+
+ dbManager.query("update jahia_autoids set
jahia_autoids_currentindex="+uriId+" where
jahia_autoids_tablename='JAHIA_SL2_URI'");
+
+ PreparedStatement getVersion =
dbManager.prepareStatement("select * from jahia_sl2_version where uri_id=?");
+ PreparedStatement insertVersion =
dbManager.prepareStatement("insert into jahia_sl2_version values(?,?)");
+ PreparedStatement insertVersionHistory =
dbManager.prepareStatement("insert into jahia_sl2_version_history
values(?,?,?,?)");
+ PreparedStatement getProperty =
dbManager.prepareStatement("select * from jahia_sl2_properties where
version_id=?");
+ PreparedStatement insertProperty =
dbManager.prepareStatement("insert into jahia_sl2_properties
values(?,?,?,?,?,?)");
+
+ rs = dbManager.selectFromTable("uri_id", "jahia_sl2_uri");
+ while (rs.next()) {
+ uriId = rs.getInt(1);
+
+ getVersion.setInt(1,uriId);
+ ResultSet rs2 = getVersion.executeQuery();
+ if (!rs2.next()) {
+ insertVersion.setInt(1,uriId);
+ insertVersion.setInt(2,0);
+ insertVersion.executeUpdate();
+
+ insertVersionHistory.setInt(1,uriId);
+ insertVersionHistory.setInt(2,uriId);
+ insertVersionHistory.setInt(3,1);
+ insertVersionHistory.setString(4,"1.0");
+ insertVersionHistory.executeUpdate();
+ }
+
+ getProperty.setInt(1,uriId);
+ rs2 = getProperty.executeQuery();
+ if (!rs2.next()) {
+ insertProperty.setInt(1,uriId);
+ 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();
+
+
File f = new
File("WEB-INF/classes/org/apache/slide/slide.properties");
if (f.exists()) {
f.delete();
