Changeset 30933 for other-projects/hathitrust

Timestamp:

2016-10-26T10:24:53+13:00 (7 years ago)

Author:

davidb

Message:

More careful parsing of file prefix

File:

• other-projects/hathitrust/solr-extracted-features/trunk/src/main/java/org/hathitrust/PagedJSON.java (modified) (1 diff)

other-projects/hathitrust/solr-extracted-features/trunk/src/main/java/org/hathitrust/PagedJSON.java

@@ -48 +48 @@
         
         if (fileIn.startsWith("hdfs://")) {
-        URI uri = URI.create (fileIn);
-        Configuration conf = new Configuration();
-        FileSystem file = FileSystem.get(uri, conf);
-        FSDataInputStream fin = file.open(new Path(uri));
-         
-        bis = new BufferedInputStream(fin);
+            URI uri = URI.create (fileIn);
+            Configuration conf = new Configuration();
+            FileSystem file = FileSystem.get(uri, conf);
+            FSDataInputStream fin = file.open(new Path(uri));
+
+            bis = new BufferedInputStream(fin);
         }
         else {
-          FileInputStream fin = new FileInputStream(fileIn);
-          bis = new BufferedInputStream(fin);
+            // Trim 'file://' off the front
+            
+            String local_file_in = fileIn;
+            if (local_file_in.startsWith("file://")) {
+                local_file_in = fileIn.substring("file://".length());
+            }
+            FileInputStream fin = new FileInputStream(local_file_in);
+            bis = new BufferedInputStream(fin);
         }
-        
+
         return bis;