Changeset 6017

Timestamp:

2003-11-27T12:32:56+13:00 (20 years ago)

Author:

cs025

Message:

Improved field names in database

Location:

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/metadata

Files:

• METSDivision.java (modified) (10 diffs)
• METSStructure.java (modified) (3 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/metadata/METSDivision.java

@@ -292 +292 @@
     // set the "where" to find the reference for this division
     GS3SQLSelect select = new GS3SQLSelect("divisions");
-    select.addField("divisionRef");
+    select.addField("DivisionRef");
     GS3SQLWhereItem whereItem = new GS3SQLWhereItem("ParentRef", "=", Integer.toString(parentRef), GS3SQLField.INTEGER_TYPE);
     GS3SQLWhereItem parentItem = new GS3SQLWhereItem("ParentType", "=", parentIsStructure ? "Structure" : "Division");
@@ -321 +321 @@
       }
       else {
-    sqlRef = resultSet.getInt("divisionRef");
+    sqlRef = resultSet.getInt("DivisionRef");
     
     GS3SQLUpdate update = new GS3SQLUpdate("divisions");
     GS3SQLWhere  updateWhere = 
-      new GS3SQLWhere(new GS3SQLWhereItem("divisionRef", "=", Integer.toString(sqlRef), 
+      new GS3SQLWhere(new GS3SQLWhereItem("DivisionRef", "=", Integer.toString(sqlRef), 
                           GS3SQLField.INTEGER_TYPE));
     update.setWhere(updateWhere);
@@ -336 +336 @@
     }
       
-    action.addValue("Type", this.type.toString());
+    action.addValue("DivisionType", this.type.toString());
     action.addValue("LabelOrder", this.order);
     action.addValue("ShortLabel", this.orderLabel);
@@ -358 +358 @@
     }
     resultSet.first();
-    sqlRef = resultSet.getInt("divisionRef");
+    sqlRef = resultSet.getInt("DivisionRef");
     resultSet.close();
     resultSet = null;
@@ -379 +379 @@
     // delete the old file/metadata references
     GS3SQLWhere referenceWhere = 
-      new GS3SQLWhere(new GS3SQLWhereItem("divisionRef", "=", Integer.toString(sqlRef), 
+      new GS3SQLWhere(new GS3SQLWhereItem("DivisionRef", "=", Integer.toString(sqlRef), 
                       GS3SQLField.INTEGER_TYPE));
 
@@ -397 +397 @@
       { GS3SQLInsert fileinsert = new GS3SQLInsert("divisionfilerefs");
         fileinsert.addValue("DocID", docId.toString());
-        fileinsert.addValue("divisionRef", Integer.toString(sqlRef), GS3SQLField.INTEGER_TYPE);
-    fileinsert.addValue("Type", "Group");
+        fileinsert.addValue("DivisionRef", Integer.toString(sqlRef), GS3SQLField.INTEGER_TYPE);
+    fileinsert.addValue("DivisionType", "Group");
     fileinsert.addValue("FileID", iterator.next().toString());
     connection.execute(fileinsert.toString());
@@ -411 +411 @@
       { GS3SQLInsert metainsert = new GS3SQLInsert("divisionmetarefs");
         metainsert.addValue("DocID", docId.toString());
-        metainsert.addValue("divisionRef", Integer.toString(sqlRef), GS3SQLField.INTEGER_TYPE);
-    metainsert.addValue("Type", "Group");
+        metainsert.addValue("DivisionRef", Integer.toString(sqlRef), GS3SQLField.INTEGER_TYPE);
+    metainsert.addValue("DivisionType", "Group");
     metainsert.addValue("MetaID", iterator.next().toString());
     connection.execute(metainsert.toString());
@@ -438 +438 @@
       // read the basic information
       String ID   = resultSet.getString("SectionID");
-      String type = resultSet.getString("Type");
-      String order = resultSet.getString("LabelOrder");
+      String type = resultSet.getString("DivisionType");
+      String order = resultSet.getString("LabelOrder"); 
       String orderLabel = resultSet.getString("ShortLabel");
       String userLabel  = resultSet.getString("UserLabel");
@@ -473 +473 @@
       select = new GS3SQLSelect("divisionfilerefs");
       select.addField("*");
-      where = new GS3SQLWhere(new GS3SQLWhereItem("divisionRef", "=", Integer.toString(divisionRef), 
+      where = new GS3SQLWhere(new GS3SQLWhereItem("DivisionRef", "=", Integer.toString(divisionRef), 
                           GS3SQLField.INTEGER_TYPE));
       select.setWhere(where);
@@ -490 +490 @@
       select = new GS3SQLSelect("divisionmetarefs");
       select.addField("*");
-      where = new GS3SQLWhere(new GS3SQLWhereItem("divisionRef", "=", Integer.toString(divisionRef), 
+      where = new GS3SQLWhere(new GS3SQLWhereItem("DivisionRef", "=", Integer.toString(divisionRef), 
                           GS3SQLField.INTEGER_TYPE));
       select.setWhere(where);

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/metadata/METSStructure.java

@@ -173 +173 @@
       insert.addValue("DocID", document.getID().toString());
       insert.addValue("StructureID", this.ID.toString());
-      insert.addValue("Type", this.type);
+      insert.addValue("StructureType", this.type);
       insert.addValue("Label", this.label);
       
@@ -197 +197 @@
       update.setWhere(where);
 
-      update.addValue("Type", this.type);
+      update.addValue("StructureType", this.type);
       update.addValue("Label", this.label);
 
@@ -222 +222 @@
     try {
       String ID    = resultSet.getString("StructureID");
-      String type  = resultSet.getString("Type");
+      String type  = resultSet.getString("StructureType");
       String label = resultSet.getString("Label");