Changeset 30617 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/build/GS2PerlConstructor.java

Timestamp:

2016-07-22T19:41:17+12:00 (8 years ago)

Author:

ak19

Message:

Bugfix to oversight: web document editor didn't reindex on removing metadata, only on setting it. This is because there wasn't corresponding Service on Java side to handle removing metadata. Now the Java code has a ModifyMetdata service and this is connected to both the set- and remove-metadata functions in the javascript. For now, the javascript metadataserver calls have been made synchronous by setting the async ajax-jquery property to false. Need to test whether the code still works asynchronous as before.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/build/GS2PerlConstructor.java (modified) (4 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/build/GS2PerlConstructor.java

@@ -35 +35 @@
     public static final int BUILD = 2;
     public static final int ACTIVATE = 3;
-    public static final int SET_METADATA_SERVER = 4;
+    public static final int MODIFY_METADATA_SERVER = 4;
 
     /**
@@ -122 +122 @@
             activateCollection();
             break;
-        case SET_METADATA_SERVER:
-            setMetadataForCollection();
+        case MODIFY_METADATA_SERVER:
+            modifyMetadataForCollection();
             break;
         default:
@@ -285 +285 @@
         command.add("-collectdir");
         command.add(GSFile.collectDir(this.site_home));
-//      command.add("-removeold"); // saves some seconds processing time when this flag's added in explicitly
+//      command.add("-removeold"); // saves some seconds processing time when this flag's added in explicitly. Shouldn't be added for incremental building
         command.add("-skipactivation"); // gsdl3/util/GS2Construct does the activation and reactivation
         command.addAll(extractParameters(this.process_params));
@@ -302 +302 @@
 
 
-    protected void setMetadataForCollection()
-    {
-        sendMessage(new ConstructionEvent(this, GSStatus.INFO, "Collection metadata: setMetadata for collection."));
+    protected void modifyMetadataForCollection()
+    {
+        sendMessage(new ConstructionEvent(this, GSStatus.INFO, "Collection metadata: modifyMetadata (set or remove meta) for collection."));
 
         Vector<String> command = new Vector<String>();