Changeset 9052

Timestamp:

2005-02-16T10:12:22+13:00 (19 years ago)

Author:

mdewsnip

Message:

For some reason the lock file written when a collection is just created is different from that when the collection is reloaded. Worse, it wasn't valid XML so the tidied up parsing would barf on it. Now the same lock file is written is both circumstances, making everything a lot tidier.

File:

• trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java (modified) (5 diffs)

trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -203 +203 @@
     File lock_file = new File(collection_directory_path + LOCK_FILE);
     lock_file.delete();
-    if(lock_file.exists()) {
-        System.err.println("Lockfile was not successfully deleted.");
+    if (lock_file.exists()) {
+        System.err.println("Warning: Lockfile was not successfully deleted.");
     }
 
@@ -443 +443 @@
         progress.setProgress(3);
 
-        // Create a lock file.
-        File lock_file = new File(collection_directory_path, LOCK_FILE);
-        FileOutputStream out = new FileOutputStream(lock_file);
-        out.write(LOCK_FILE.getBytes());
-        out.close();
-        out = null;
+        // Create a lock file
+        createLockFile(new File(collection_directory_path, LOCK_FILE));
 
         progress.setProgress(4);
@@ -460 +456 @@
 
 
-    public void createLockFile(File destination) {
+    private void createLockFile(File lock_file)
+    {
     try {
         Document default_lockfile = Utility.parse("xml/" + LOCK_FILE, true);
@@ -478 +475 @@
         date_element = null;
         date_time = null;
-        XMLTools.writeXMLFile(destination, default_lockfile);
-    }
-    catch (Exception error) {
-        DebugStream.printStackTrace(error);
+        XMLTools.writeXMLFile(lock_file, default_lockfile);
+    }
+    catch (Exception exception) {
+        DebugStream.printStackTrace(exception);
     }
     }
@@ -488 +485 @@
     public boolean deleteCollection(String collection_name)
     {
-    File collection_directory = new File(getCollectionDirectoryPath(collection_name));
-    return Utility.delete(collection_directory);
+    return Utility.delete(new File(getCollectionDirectoryPath(collection_name)));
     }