/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 7671

Added by ben leinfelder over 11 years ago

adjust action=zip behavior to use full docids and entity names (data files) for the zip entry. Also uses the given qformat to render the metadata. https://projects.ecoinformatics.org/ecoinfo/issues/3816

+                }
                 // Create a DBuery to handle export
                 queryObj = new DBQuery();
                 String qformat = null;
                 if (params.containsKey("qformat")) {
                     qformat = params.get("qformat")[0];
                     queryObj.setQformat(qformat);
+                }
                 // Get the docid
                 docId = docs[0];
                 // Make sure the client specify docid
-...
                     return;
+                }
                 // Get output stream
                 response.setContentType("application/zip"); //MIME type
                 response.setHeader("Content-Disposition",
                         "attachment; filename="
                         + docId + ".zip"); // Set the name of the zip file
                 out = response.getOutputStream();
                 zOut = new ZipOutputStream(out);
                 zOut = queryObj
                         .getZippedPackage(docId, out, user, groups, passWord);
                 zOut.finish(); //terminate the zip file
                 response.setContentType("application/zip"); //MIME type
                 response.setHeader("Content-Disposition",
                         "attachment; filename="
                         + docId + ".zip"); // Set the name of the zip file
                 zOut.close(); //close the zip stream
             } catch (Exception e) {
-...
                         withInlineData = false;
+                    }
                 }*/
                 // handle special case where the PID was given
                 if (params.containsKey("pid")) {
                     docs = params.get("pid");
                 	for (int i = 0; i < docs.length; i++) {
                 		String pid = docs[i];
                 		// look up the pid if we have it
                 		String localId = IdentifierManager.getInstance().getLocalId(pid);
                 		docs[i] = localId;
+                	}
                 	// put docid in parms for downstream methods to use
                 	params.put("docid", docs);
+                }
                 if ((docs.length > 1) || qformat.equals("zip")) {
                     zip = true;
                     out = response.getOutputStream();

     		this.operator = operator;
+    	}
     	public String getQformat() {
     		return qformat;
+    	}
     	public void setQformat(String qformat) {
     		this.qformat = qformat;
+    	}
     	/**
          * Check if the user has the permission to export data package
+         *
-...
             byteString = docImpl.getBytes();
             //use docId as the zip entry's name
             zEntry = new ZipEntry(packageZipEntry + "/metadata/"
                     + docImpl.getDocID());
             String fullDocId = docImpl.getDocID() + PropertyService.getProperty("document.accNumSeparator") + docImpl.getRev();
     		zEntry = new ZipEntry(packageZipEntry + "/metadata/" + fullDocId );
             zEntry.setSize(byteString.length);
             zipOut.putNextEntry(zEntry);
             zipOut.write(byteString, 0, byteString.length);
-...
             if (!filePath.endsWith("/")) {
                 filePath += "/";
+            }
             String fileName = filePath + docImpl.getDocID();
             zEntry = new ZipEntry(packageZipEntry + "/data/" + docImpl.getDocID());
             String fileName = docImpl.getDocID() + PropertyService.getProperty("document.accNumSeparator") + docImpl.getRev();
             String entityName = docImpl.getDocname();
             filePath = filePath + fileName;
             zEntry = new ZipEntry(packageZipEntry + "/data/" + fileName + "-" + entityName);
             zipOut.putNextEntry(zEntry);
             FileInputStream fin = null;
             try {
                 fin = new FileInputStream(fileName);
                 fin = new FileInputStream(filePath);
                 byte[] buf = new byte[4 * 1024]; // 4K buffer
                 int b = fin.read(buf);
                 while (b != -1) {
-...
                     htmlDoc.append("</h2>");
                     //do the actual transform
                     StringWriter docString = new StringWriter();
                     xmlToHtml.transformXMLDocument(((DocumentImpl) docImplList
                             .elementAt(i)).toString(), "-//NCEAS//eml-generic//EN",
                             "-//W3C//HTML//EN", "html", docString, null, null);
                     xmlToHtml.transformXMLDocument(
                     		((DocumentImpl) docImplList.elementAt(i)).toString(),
                     		((DocumentImpl) docImplList.elementAt(i)).getDoctype(), //"-//NCEAS//eml-generic//EN",
                             "-//W3C//HTML//EN",
                             qformat,
                             docString,
                             null,
                             null);
                     htmlDoc.append(docString.toString());
                     htmlDoc.append("<br><br><hr><br><br>");
                 }//if

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 7671

Added by ben leinfelder over 11 years ago