Changeset 6203

Timestamp:

2003-12-10T16:35:17+13:00 (20 years ago)

Author:

jmt12

Message:

Further to the changes yesterday, sources from within the collect folder now have their full name and short name in brackets

File:

• trunk/gli/src/org/greenstone/gatherer/mem/MEMNode.java (modified) (4 diffs)

trunk/gli/src/org/greenstone/gatherer/mem/MEMNode.java

@@ -37 +37 @@
 package org.greenstone.gatherer.mem;
 
+import java.io.*;
 import java.util.*;
 import javax.swing.tree.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
+import org.greenstone.gatherer.collection.BasicCollectionConfiguration;
 import org.greenstone.gatherer.mem.AttributeTableModel;
 import org.greenstone.gatherer.msm.ElementWrapper;
 import org.greenstone.gatherer.msm.MetadataSet;
 import org.greenstone.gatherer.msm.MetadataSetManager;
+import org.greenstone.gatherer.util.Utility;
 import org.w3c.dom.*;
 /**
@@ -54 +58 @@
     private AttributeTableModel model = null;
     private int type = 0;
+    private String text = null;
     static final public int COLLECTION = 0;
     static final public int ELEMENT    = 1;
@@ -68 +73 @@
     this.parent = parent;
     this.type = type;
+    this.text = null;
     }
 
@@ -131 +137 @@
     this.model = model;
     }
+
     public String toString() {
-    String text = "error";
-    if(userObject != null) {
-        if(userObject instanceof ElementWrapper) {
-        text = ((ElementWrapper)userObject).getName();
+    if(text == null) {
+        if(userObject != null) {
+        if(userObject instanceof ElementWrapper) {
+            text = ((ElementWrapper)userObject).getName();
+        }
+        // In the case of a 'collection' source path we need to examine the path closely. If it is a descendant of the greenstone collections path then supress everything but the collection name
+        else if(type == COLLECTION) {
+            try {
+            boolean is_descendant = false;
+            File source_path = new File((String)userObject);
+            File collect_path = new File(Utility.getCollectionDir(Gatherer.config.gsdl_path));
+            File current_path = source_path;
+            while(!is_descendant && current_path != null) {
+                is_descendant = current_path.equals(collect_path);
+                current_path = current_path.getParentFile();
+            }
+            current_path = null;
+            collect_path = null;
+            // We've either found we are a descendant, or run out of path
+            if(is_descendant) {
+                // Create a basic config class
+                BasicCollectionConfiguration config = new BasicCollectionConfiguration(new File(source_path, Utility.CONFIG_DIR));
+                text = config.toString();
+                config = null;
+            }
+            else {
+                text = source_path.getAbsolutePath();
+            }
+            }
+            catch(Exception exception) {
+            Gatherer.println("Exception in MEMNode.toString() - exception is unexpected");
+            Gatherer.printStackTrace(exception);
+            text = userObject.toString();
+            }
+        }
+        else {
+            text = userObject.toString();
+        }
         }
         else {
-        text = userObject.toString();
+        text = "error";
         }
     }