Changeset 6014

Timestamp:

2003-11-26T16:10:05+13:00 (20 years ago)

Author:

cs025

Message:

Changed database identifiers

Location:

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

Files:

• metadata/METSDivision.java (modified) (4 diffs)
• metadata/METSFile.java (modified) (3 diffs)
• util/GS3SQLConnection.java (modified) (3 diffs)

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

@@ -399 +399 @@
         fileinsert.addValue("divisionRef", Integer.toString(sqlRef), GS3SQLField.INTEGER_TYPE);
     fileinsert.addValue("Type", "Group");
-    fileinsert.addValue("fileRef", iterator.next().toString());
+    fileinsert.addValue("FileID", iterator.next().toString());
     connection.execute(fileinsert.toString());
       }
@@ -413 +413 @@
         metainsert.addValue("divisionRef", Integer.toString(sqlRef), GS3SQLField.INTEGER_TYPE);
     metainsert.addValue("Type", "Group");
-    metainsert.addValue("metadataRef", iterator.next().toString());
+    metainsert.addValue("MetaID", iterator.next().toString());
     connection.execute(metainsert.toString());
       }
@@ -482 +482 @@
       if (fileSet != null && fileSet.first())
       { do 
-    { String reference = fileSet.getString("fileRef");
+    { String reference = fileSet.getString("FileID");
       division.fileRefs.add(reference);
     }
@@ -499 +499 @@
       if (metaSet != null && metaSet.first())
       { do 
-    { String reference = metaSet.getString("metadataRef");
+    { String reference = metaSet.getString("MetaID");
       division.metadataRefs.add(reference);
     }

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

@@ -186 +186 @@
                             GS3SQLField.INTEGER_TYPE);
     GS3SQLWhere  where  = new GS3SQLWhere(whereItem);
-    whereItem = new GS3SQLWhereItem("ID","=", this.id.toString());
+    whereItem = new GS3SQLWhereItem("FileID","=", this.id.toString());
     where.add(whereItem);
     select.setWhere(where);
@@ -199 +199 @@
 
         insert.addValue("FileGroupRef", Integer.toString(groupReference), GS3SQLField.INTEGER_TYPE);
-    insert.addValue("ID", this.id.toString());
+    insert.addValue("FileID", this.id.toString());
     
     action = insert;
@@ -228 +228 @@
       String location = parentSet.getString("FileLocation");
       String mimeType = parentSet.getString("MIMEType");
-      String id = parentSet.getString("ID");
+      String id = parentSet.getString("FileID");
 
       METSFileID metsID = new METSFileID(id);

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/util/GS3SQLConnection.java

@@ -214 +214 @@
       metaRefs.addProperty("DocID", 64);
       metaRefs.addProperty("divisionRef", GS3SQLField.INTEGER_TYPE);
-      metaRefs.addProperty("Type", 16);        // whether a namespace or meta ref
-      metaRefs.addProperty("metadataRef", 32); // the metadata reference itself, as a string
+      metaRefs.addProperty("Type", 16);   // whether a namespace or meta ref
+      metaRefs.addProperty("MetaID", 64); // the metadata reference itself, as a string
       statement.execute(metaRefs.toString());
 
@@ -223 +223 @@
       fileRefs.addProperty("divisionRef", GS3SQLField.INTEGER_TYPE);
       fileRefs.addProperty("Type", 16); // whether section, group or file
-      fileRefs.addProperty("fileRef", 32);
+      fileRefs.addProperty("FileID", 32);
       statement.execute(fileRefs.toString());
       
@@ -280 +280 @@
       files.addProperty("FileLocation");
       files.addProperty("MIMEType", 64);
-      files.addProperty("ID", 32);
+      files.addProperty("FileID", 32);
       statement.execute(files.toString());