Changeset 5372

Timestamp:

2003-08-29T16:27:45+12:00 (21 years ago)

Author:

jmt12

Message:

Added then removed some debug stuff

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• gui/MetaEditPane.java (modified) (3 diffs)
• util/Codec.java (modified) (2 diffs)

trunk/gli/src/org/greenstone/gatherer/gui/MetaEditPane.java

@@ -203 +203 @@
         ElementWrapper element = tree.getSelectedMetadataElement();
         String value = tree.getSelectedValue();
-        System.err.println("Adding value:");
+        Gatherer.println("Adding value:");
         if(records != null && element != null && value != null) {
         // Check the records, and if they are folders then display the warning.
@@ -234 +234 @@
         ElementWrapper element = tree.getSelectedMetadataElement();
         String value = tree.getSelectedValue();
+        Gatherer.println("Replacing value:");
         if(selected_metadata != null && records != null && element != null && value != null) {
         selected_metadata = Gatherer.c_man.getCollection().msm.updateMetadata(System.currentTimeMillis(), selected_metadata, records, value, MetaEditPrompt.CONFIRM, selected_metadata.isFileLevel());
@@ -247 +248 @@
 
     public void run() {
+        Gatherer.println("Removing value:");
         if(selected_metadata != null && records != null) {
         Gatherer.c_man.getCollection().msm.removeMetadata(System.currentTimeMillis(), selected_metadata, records);

trunk/gli/src/org/greenstone/gatherer/util/Codec.java

@@ -46 +46 @@
     static final public String TEXT_TO_SHELL_UNIX = "TEXT_TO_SHELL_UNIX";
     static final public String TEXT_TO_SHELL_WINDOWS = "TEXT_TO_SHELL_WINDOWS";
+
+    static final private int MAX_CACHE_SIZE = 100;
     
     static private HashMap TRANSFORMS;
+    static private HashMap3D CACHE;
+
     
     /** Static function called to construct TRANSFORMS mappings */
@@ -142 +146 @@
     TRANSFORMS.put(TEXT_TO_SHELL_WINDOWS, text_to_shell_windows);
     text_to_shell_windows = null;
+
+    CACHE = new HashMap3D();
     }
 
     static public String transform(String raw, String transform) {
-    String processed = raw;
-    String[] transforms = (String[]) TRANSFORMS.get(transform);
-    if(transforms != null) {
-        for(int i = 0; i < transforms.length; i = i + 2) {
-        String target = transforms[i];
-        String result = transforms[i+1];
-        processed = processed.replaceAll(target, result);
-        }
+    String processed = (String) CACHE.get(transform, raw);
+    if(processed == null) {
+        processed = raw;
+        String[] transforms = (String[]) TRANSFORMS.get(transform);
+        if(transforms != null) {
+        for(int i = 0; i < transforms.length; i = i + 2) {
+            String target = transforms[i];
+            String result = transforms[i+1];
+            processed = processed.replaceAll(target, result);
+        }
+        }
+        //Gatherer.println("*** Transform: " + transform + " ***");
+        //Gatherer.println("*** Raw      : '" + raw + "'");
+        //Gatherer.println("*** Processed: '" + processed + "'");
+        // If cache is at maximum size, empty it and start again
+        if(CACHE.size() == MAX_CACHE_SIZE) {
+        CACHE.clear();
+        }
+        CACHE.put(transform, raw, processed);
     }
-    //Gatherer.println("*** Transform: " + transform + " ***");
-    //Gatherer.println("*** Raw      : '" + raw + "'");
-    //Gatherer.println("*** Processed: '" + processed + "'");
     return processed;
     }