Changeset 25074 for main/trunk

Timestamp:

2012-02-13T13:47:58+13:00 (12 years ago)

Author:

sjm84

Message:

Fixed a problem with deleting documents

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSDocumentModel.java (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSDocumentModel.java

@@ -216 +216 @@
         if (!section)
         {
-            File dirToDelete = new File(_siteHome + File.separatorChar + "collect" + File.separatorChar + collection + File.separatorChar + "archives" + File.separatorChar + oid);
+            String archivesFile = archiveGetDocumentFilePath(oid, collection, userContext);
+            String archivesFolder = archivesFile.substring(0, archivesFile.lastIndexOf(File.separator));
+            File dirToDelete = new File(archivesFolder);
 
             if (!dirToDelete.exists() || !dirToDelete.isDirectory() || !deleteDirectory(dirToDelete))