Merge pull request #4 from Caltech-IPAC/develop

Version 1.0.5

Author: bjfultn

pyneid/neid/core.py

@@ -1750,7 +1750,12 @@ def download (self, metapath, datalevel, format, outdir, **kwargs):
         """urls for nph-neidDownload.py
         """
 
-        self.getneid_url = self.baseurl + 'cgi-bin/NeidAPI/nph-neidDownload.py?'
+        #self.getneid_url = self.baseurl + 'cgi-bin/NeidAPI/nph-neidDownload.py?'
+        getfile_baseurl = 'https://neid.ipac.caltech.edu/'
+
+        self.getneid_url = getfile_baseurl + 'get_file.php?'
+        #self.getneid_url = getfile_baseurl + 'get_file_pyNEID.php?'
+
 
         if self.debug:
             logging.debug ('')
@@ -1806,8 +1811,21 @@ def download (self, metapath, datalevel, format, outdir, **kwargs):
             """get data files
             """
 
-            url = self.getneid_url + 'datalevel=' + datalevel + \
-                '&filepath=' + '/' + filepath + '&debug=1'
+            #url = self.getneid_url + 'datalevel=' + datalevel + \
+            #    '&filepath=' + '/' + filepath + '&debug=1'
+            
+            url = self.getneid_url + 'filehand=' + filepath
+           
+            if ((datalevel == 'eng') or (datalevel == 'solareng')):
+                url = url + '&eng'
+
+            if ((datalevel == 'solarl0') or \
+                (datalevel == 'solarl1') or \
+                (datalevel == 'solarl2') or \
+                (datalevel == 'solareng')):
+                url = url + '&solar'
+
+            url = url + '&json'
 
             filepath = self.outdir + '/' + filename 
 
@@ -3723,4 +3741,3 @@ def __get_statusjob (self):
 
 
 Neid = Archive()
-print ('Neid instantiated')

setup.py

@@ -11,7 +11,7 @@
 
 setup(
     name="pyneid",
-    version="1.0.4",
+    version="1.0.5",
     author="Mihseh Kong",
     description="NEID archive access client", 
     long_description = long_description,