Changeset 31358 for other-projects/hathitrust

Timestamp:

2017-01-25T00:04:07+13:00 (7 years ago)

Author:

davidb

Message:

Make workset download save as file

File:

• other-projects/hathitrust/wcsa/vol-checker/src/org/hathitrust/extractedfeatures/VolumeCheck.java (modified) (7 diffs)

other-projects/hathitrust/wcsa/vol-checker/src/org/hathitrust/extractedfeatures/VolumeCheck.java

@@ -112 +112 @@
 
                 if ((line_num % 100000) == 0) {
-                    //System.err.println("sample id = " + id);
-                    //System.err.println("Passed line: " + line_num);
                     System.err.print(".");
                 }
@@ -165 +163 @@
             Process proc = runtime.exec(rsync_command);
             proc.waitFor();
-            //System.err.println("*** Rsync finished");
         
             FileInputStream fis = new FileInputStream(json_filename_tail);
@@ -179 +176 @@
     }
     
-    protected void doCollectionToWorkset(HttpServletResponse response, String c, String a, String format) throws IOException
+    protected void doCollectionToWorkset(HttpServletResponse response, String col_title, 
+                            String c, String a, String format) throws IOException
     {
         String post_url_params  = "c="+c+"&a="+a+"&format="+format;
@@ -231 +229 @@
                 ci++;
             }
-              
+             
+            String col_title_filename = col_title + ".txt";
             response.setContentType("text/plain");
+            response.setHeader("Content-Disposition", "attachment; filename=\"" + col_title_filename + "\"");
+
             PrintWriter pw = response.getWriter();
             pw.append(workset_friendly_sb.toString());
@@ -253 +254 @@
     protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException 
     {
-        
-        
         String cgi_ids = request.getParameter("ids");
         String cgi_id = request.getParameter("id");
@@ -332 +331 @@
         }
         else if (cgi_convert_col != null) {
-            // c=464226859&a=download&format=text
-            //String cgi_c = request.getParameter("c");
+            
+            String cgi_col_title = request.getParameter("col-title");
             String cgi_a = request.getParameter("a");
             String cgi_format = request.getParameter("format");
@@ -341 +340 @@
             }
             else {
-                doCollectionToWorkset(response,cgi_convert_col,cgi_a,cgi_format);
+                if (cgi_col_title == null) {
+                    cgi_col_title = "htrc-workset-" + cgi_convert_col;
+                }
+
+                doCollectionToWorkset(response,cgi_col_title,cgi_convert_col,cgi_a,cgi_format);
             }