- Timestamp:
- 2020-07-04T06:34:20+12:00 (4 years ago)
- Location:
- main/trunk/gli/src/org/greenstone/gatherer
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java
r34235 r34246 68 68 import org.greenstone.gatherer.metadata.MetadataSetManager; 69 69 import org.greenstone.gatherer.metadata.MetadataXMLFileManager; 70 import org.greenstone.gatherer.metadata.MetadataElement; 71 import org.greenstone.gatherer.metadata.MetadataValue; 70 72 import org.greenstone.gatherer.metadata.ProfileXMLFileManager; 71 73 import org.greenstone.gatherer.remote.RemoteGreenstoneServer; … … 153 155 } 154 156 } 155 156 157 158 /** helper methods to export metadata for collection files to csv */ 159 public TreeMap<File, ArrayList> getAllAssignedMetadataForAllFiles() { 160 TreeMap<File, ArrayList> files_with_meta = new TreeMap<File, ArrayList>(); 161 162 ArrayList<File> files = listFilesInCollection(); 163 Iterator<File> i = files.iterator(); 164 165 while(i.hasNext()) { 166 File f = i.next(); 167 ArrayList file_meta = MetadataXMLFileManager.getMetadataAssignedToFile(f); 168 files_with_meta.put(f, file_meta); 169 170 // debugging display 171 System.err.println("Meta for file: " + f.getAbsolutePath()); 172 Iterator it = file_meta.iterator(); 173 while(it.hasNext()) { 174 MetadataValue meta = (MetadataValue)it.next(); 175 String metaVal = meta.getValue(); 176 MetadataElement metaEl = meta.getMetadataElement(); 177 String metaName = metaEl.getFullName(); 178 System.err.println(" field: " + metaName); 179 System.err.println(" value: " + metaVal); 180 } 181 182 } 183 184 return files_with_meta; 185 } 186 187 public ArrayList<File> listFilesInCollection() { 188 ArrayList<File> files = new ArrayList<File>(); 189 if(collection_tree_model != null) { 190 collection_tree_model.getFileListing(files); 191 } 192 return files; 193 } 194 157 195 static public void addCollectionContentsChangedListener(CollectionContentsChangedListener listener) 158 196 { … … 1307 1345 File external_metadata_set_file = external_metadata_set.getMetadataSetFile(); 1308 1346 File metadata_set_file = new File(getLoadedCollectionMetadataDirectoryPath(), external_metadata_set_file.getName()); 1347 1309 1348 // If we're using a remote Greenstone server, upload the metadata file 1310 1349 if (Gatherer.isGsdlRemote) { 1311 1350 Gatherer.remoteGreenstoneServer.uploadCollectionFile(collection.getGroupQualifiedName(false), metadata_set_file); 1312 1351 } 1313 } 1314 catch (Exception exception) { 1315 DebugStream.printStackTrace(exception); 1316 } 1352 1353 // It's not enough that the local collection's mds file in gli user location 1354 // (e.g. AppData/Roaming/Greenstone/GLI/collect/<collname>/metadata gets updated, 1355 // Need to also update local GS3's installation's gli/metadatacopy of the .mds file 1356 if (metadata_set_file.exists()) { 1357 System.err.println("@@@ Replacing: " + metadata_set_file); 1358 System.err.println("@@@ With: " + external_metadata_set_file); 1359 1360 // delete GLI's copy and replace 1361 //if(metadata_set_file.delete()) { // only if deletion was sucessful, try to replace 1362 //Gatherer.f_man.getQueue().copyFile(external_metadata_set_file, metadata_set_file, true);// true for overwrite 1363 //} 1364 1365 } 1366 } catch (Exception exception) { 1367 DebugStream.printStackTrace(exception); 1368 } 1317 1369 } 1318 1370 -
main/trunk/gli/src/org/greenstone/gatherer/file/FileNode.java
r23433 r34246 378 378 /** Tests if this enumeration contains more elements. */ 379 379 public boolean hasMoreElements() { 380 if(child_nodes == null) { // special case needed handling 381 return false; 382 } 380 383 return (index < child_nodes.size()); 381 384 } -
main/trunk/gli/src/org/greenstone/gatherer/file/FileSystemModel.java
r13466 r34246 31 31 } 32 32 33 /** helper methods to export metadata for collection files to csv */ 34 public void getFileListing(ArrayList<File> files) { 35 getFileListing(root, files); 36 return; 37 } 38 39 private void getFileListing(TreeNode node, ArrayList<File> files) { 40 if(node == null) return; 41 42 if(!(node instanceof FileNode)) { 43 return; 44 } else { 45 FileNode current = (FileNode)node; 46 files.add(current.getFile()); 47 if(current.isLeaf()) { 48 return; 49 } 50 51 Enumeration children = current.children(); 52 while(children.hasMoreElements()) { 53 FileNode child = (FileNode)children.nextElement(); 54 getFileListing(child, files); 55 } 56 } 57 } 58 33 59 public FileFilter[] getFilters() { 34 60 if(filters == null) { -
main/trunk/gli/src/org/greenstone/gatherer/gui/ConfigFileEditor.java
r34205 r34246 204 204 } 205 205 } 206 206 207 207 208 // Final dialog setup & positioning. 208 setDefaultCloseOperation(DISPOSE_ON_CLOSE); // get rid of this dialog when it's closed (on dispose())209 this.setDefaultCloseOperation(DISPOSE_ON_CLOSE); // get rid of this dialog when it's closed (on dispose()) 209 210 this.addWindowListener(new WindowAdapter() { // called on dispose. Return focus to any curr GLI Pane 210 public void windowClose(WindowEvent we) { 211 @Override 212 public void windowClosed(WindowEvent we) { 213 super.windowClosed(we); 211 214 Gatherer.g_man.doRegainFocus(); 215 //Gatherer.g_man.refresh(Gatherer.COLLECTION_OPENED, true); 216 Gatherer.g_man.updateUI(); 212 217 } 213 218 }); … … 228 233 editor.requestFocusInWindow(); 229 234 } 235 230 236 231 237 public void actionPerformed(ActionEvent e) { -
main/trunk/gli/src/org/greenstone/gatherer/gui/GUIManager.java
r34205 r34246 87 87 public FileOpenActionListener foa_listener = new FileOpenActionListener(); 88 88 89 90 89 /** A reference to the currently instantiated help window, if any. */ 91 90 private HelpFrame help = null; … … 305 304 } 306 305 //Gatherer.c_man.saveCollection(); //shouldn't have to do this, in theory. See above comment 306 307 Gatherer.c_man.getAllAssignedMetadataForAllFiles(); 307 308 308 309 ConfigFileEditor configEditor = new ConfigFileEditor(); … … 1083 1084 // remember to click other panes whenever they want to edit the collConfig.xml. 1084 1085 private void doLoseFocus() { 1085 1086 1086 if (previous_pane != null) { 1087 1087 if (previous_pane == gather_pane) { … … 1103 1103 } 1104 1104 public void doRegainFocus() { 1105 1106 1105 if (previous_pane != null) { 1107 1106 if (previous_pane == gather_pane) { -
main/trunk/gli/src/org/greenstone/gatherer/util/Codec.java
r34241 r34246 42 42 static final public String ENCODE_SQUARE_BRACKETS = "ENCODE_SQUARE_BRACKETS"; 43 43 static final public String ESCAPEDHTML_TO_UNESCAPED = "ESCAPEDHTML_TO_UNESCAPED"; 44 static final public String REINSTATE_HTML_TAGS = "REINSTATE_HTML_TAGS"; 44 45 static final public String GREENSTONE_TO_DOM = "GREENSTONE_TO_DOM"; 45 46 static final public String GREENSTONE_TO_TEXT = "GREENSTONE_TO_TEXT"; … … 175 176 "&", "&", 176 177 "\"", """, 177 "\'", "'"178 //"\'", "'" 178 179 }; 179 180 TRANSFORMS.put(TEXT_TO_DOM_PRESERVE_TAGS, text_to_dom_preserve_tags); … … 190 191 TRANSFORMS.put(ESCAPEDHTML_TO_UNESCAPED, escapedhtml_to_unescaped); 191 192 escapedhtml_to_unescaped = null; 193 194 // Reinstate tag markers <> 195 String[] reinstate_html_tags = { 196 "<", "<", 197 ">", ">", 198 }; 199 TRANSFORMS.put(REINSTATE_HTML_TAGS, reinstate_html_tags); 200 reinstate_html_tags = null; 201 192 202 193 203 // Transform plain html text into greenstone encoding
Note:
See TracChangeset
for help on using the changeset viewer.