Changeset 23433 for main/trunk/gli/src/org/greenstone/gatherer/metadata/MetadataValueTableModel.java

Timestamp:

2010-12-09T22:27:33+13:00 (13 years ago)

Author:

ak19

Message:

GLI now has a gs.FilenameEncoding metadata field which appears like all the others in GLI's EnrichPane, but is unique in that this metadata (once set, changed or removed) must be applied to the affected filenames in the Collection Tree. More importantly, the changes made for this are to allow GLI's java code to interact with the recent changes to Perl where strings were made unicode-aware (for proper regex matching) but which required other changes elsewhere. To still support filenames with different encodings Perl used URL encoded versions of filenames representing characters' code point values in URL encoding. This required that GLI write out URL encoded filenames to the metadata.xml files that are associated with each folder level of a collection, so that Perl can read them. In this way, they can both speak of the same filenames. Only works on unicode 16 (such as latin-1), non-UTF8 systems. The latter is a requirement since Java uses the filesystem encoding from startup. If it is UTF8, non-recognised characters are replaced by the invalid char for UTF8. This process being destructive, we can't get the original filenames' bytecodes back. The changes made to GLI will work on Windows which is UTF-16 (windows codepage 1252), presumably also Macs (some kind of UTF-16) and also works on Native Latin 1 Linux systems. UTF-8 Linux systems need to be reconfigured to Native Latin-1, or if not installed, an administrator can install it easily.

File:

• main/trunk/gli/src/org/greenstone/gatherer/metadata/MetadataValueTableModel.java (modified) (3 diffs)

main/trunk/gli/src/org/greenstone/gatherer/metadata/MetadataValueTableModel.java

@@ -139 +139 @@
 
     MetadataValueTableEntry metadata_value_table_entry = (MetadataValueTableEntry) metadata_value_table_entries.get(row);
+    
+    if(metadata_value_table_entry == null) {
+        System.err.println("\n@@@@@ MetadataValueTableModel.getValueAt(): metadata_value_table_entry is unexpectedly null!\n");
+        return null;
+    }
+    
     if (col == 0 && metadata_value_table_entry.isInheritedMetadata()) {
         return metadata_value_table_entry.getFolderMetadataInheritedFrom();
@@ -213 +219 @@
     {
     MetadataValueTableEntry metadata_value_table_entry = getMetadataValueTableEntry(row);
-
+    if(metadata_value_table_entry == null) {
+        System.err.println("\n@@@@@ MetadataValueTableModel.setValueAt(): metadata_value_table_entry is unexpectedly null!\n");
+        return;
+    }
+    
     // If nothing has changed no action is necessary
     String old_metadata_value = metadata_value_table_entry.getFullValue();
@@ -252 +262 @@
         MetadataValueTreeNode metadata_value_tree_node = metadata_element.addMetadataValue((String) new_metadata_value);
         MetadataValue metadata_value = new MetadataValue(metadata_element, metadata_value_tree_node);
-        metadata_value.setIsAccumulatingMetadata(true);
+        metadata_value.setIsAccumulatingMetadata(true);     
         (new AppendMetadataTask(metadata_value)).run();
     }