renamed 'apps' to 'gc_apps'

- bug fix for download failed row csv

.gitignore

@@ -1,3 +1,4 @@
+geoconnect/gc_apps/gis_tabular/tests/server_credentials.json
 geoconnect/apps/gis_tabular/tests/server_credentials.json
 .vagrant/*
 deploy/old/

README.md

@@ -110,7 +110,7 @@ python manage.py syncdb
 - Add initial database
 
 ```
-python manage.py loaddata apps/registered_dataverse/fixtures/incoming_filetypes_initial_data.json
+python manage.py loaddata gc_apps/registered_dataverse/fixtures/incoming_filetypes_initial_data.json
 ```
 
 * Follow the prompts to create a superuser, create tables, etc.

geoconnect/apps/classification/urls.py → geoconnect/gc_apps/classification/urls.py

@@ -1,13 +1,13 @@
 from django.conf.urls import patterns, include, url
 
 
-urlpatterns = patterns('apps.classification.views',
+urlpatterns = patterns('gc_apps.classification.views',
     #url(r'^classify-layer/(?P<shapefile_md5>\w{32})/(?P<import_success_md5>\w{32})$', 'view_classify_layer_form', name="view_classify_layer_form"),
     url(r'^classify-layer/(?P<import_success_md5>\w{32})$', 'view_classify_layer_form', name="view_classify_layer_form"),
 
 )
 
-urlpatterns += patterns('apps.classification.views_debug',
+urlpatterns += patterns('gc_apps.classification.views_debug',
     #url(r'^classify-layer/(?P<shapefile_md5>\w{32})/(?P<import_success_md5>\w{32})$', 'view_classify_layer_form', name="view_classify_layer_form"),
     url(r'^show-layer-links/?$', 'view_show_lawyer_links', name="view_show_lawyer_links"),
 

geoconnect/apps/classification/utils.py → geoconnect/gc_apps/classification/utils.py

@@ -1,9 +1,9 @@
 import logging
-from apps.layer_types.static_vals import TYPE_SHAPEFILE_LAYER,\
+from gc_apps.layer_types.static_vals import TYPE_SHAPEFILE_LAYER,\
                 TYPE_JOIN_LAYER, TYPE_LAT_LNG_LAYER,\
                 DV_MAP_TYPE_SHAPEFILE
-from apps.gis_tabular.models import WorldMapJoinLayerInfo, WorldMapLatLngInfo
-from apps.gis_shapefiles.models import WorldMapShapefileLayerInfo
+from gc_apps.gis_tabular.models import WorldMapJoinLayerInfo, WorldMapLatLngInfo
+from gc_apps.gis_shapefiles.models import WorldMapShapefileLayerInfo
 
 LOGGER = logging.getLogger(__name__)
 

geoconnect/apps/classification/views.py → geoconnect/gc_apps/classification/views.py

@@ -13,9 +13,9 @@
 
 from geo_utils.message_helper_json import MessageHelperJSON
 #from geo_utils.msg_util import msg
-from apps.dv_notify.metadata_updater import MetadataUpdater
-from apps.classification.utils import get_worldmap_info_object
-from apps.gis_tabular.forms import SELECT_LABEL
+from gc_apps.dv_notify.metadata_updater import MetadataUpdater
+from gc_apps.classification.utils import get_worldmap_info_object
+from gc_apps.gis_tabular.forms import SELECT_LABEL
 from geo_utils.json_field_reader import JSONHelper
 
 from shared_dataverse_information.layer_classification.forms import\

geoconnect/apps/classification/views_debug.py → geoconnect/gc_apps/classification/views_debug.py

@@ -8,7 +8,7 @@
 
 from geo_utils.msg_util import *
 
-from apps.classification.layer_link_helper import LayerLinkHelper
+from gc_apps.classification.layer_link_helper import LayerLinkHelper
 
 LOGGER = logging.getLogger(__name__)
 

geoconnect/apps/column_stats/models.py → geoconnect/gc_apps/column_stats/models.py

@@ -1,6 +1,6 @@
 from django.db import models
 
-from apps.core.models import TimeStampedModel
+from gc_apps.core.models import TimeStampedModel
 
 
 class BaseColumnStats(TimeStampedModel):

geoconnect/apps/column_stats/urls.py → geoconnect/gc_apps/column_stats/urls.py

@@ -1,7 +1,7 @@
 from django.conf.urls import patterns, include, url
 
 
-urlpatterns = patterns('apps.column_stats.views',
+urlpatterns = patterns('gc_apps.column_stats.views',
 
     url(r'^test/$', 'view_png_test', name="view_png_test"),
 

geoconnect/apps/dv_notify/metadata_updater.py → geoconnect/gc_apps/dv_notify/metadata_updater.py

@@ -4,8 +4,8 @@
 
 Objects passed in for worldmap_layer_info include:
 
-    - from apps.worldmap_connect.models import WorldMapLayerInfo
-    - from apps.gis_tabular.models import WorldMapJoinLayerInfo, WorldMapLatLngInfo
+    - from gc_apps.worldmap_connect.models import WorldMapLayerInfo
+    - from gc_apps.gis_tabular.models import WorldMapJoinLayerInfo, WorldMapLatLngInfo
 """
 from __future__ import print_function
 
@@ -27,7 +27,7 @@
     get_api_url_delete_metadata
 
 import logging
-LOGGER = logging.getLogger('apps.dv_notify.metadata_updater')
+LOGGER = logging.getLogger('gc_apps.dv_notify.metadata_updater')
 
 
 class MetadataUpdater(object):
@@ -278,8 +278,8 @@ def update_dataverse_with_metadata(worldmap_layer_info):
 """
 python manage.py shell
 from django.conf import settings
-from apps.dv_notify.metadata_updater import MetadataUpdater
-from apps.worldmap_connect.models import WorldMapLayerInfo
+from gc_apps.dv_notify.metadata_updater import MetadataUpdater
+from gc_apps.worldmap_connect.models import WorldMapLayerInfo
 wm_info = WorldMapLayerInfo.objects.first()
 if wm_info is not None:
     mu = MetadataUpdater(settings.DATAVERSE_SERVER_URL)
@@ -294,8 +294,8 @@ def update_dataverse_with_metadata(worldmap_layer_info):
 """
 python manage.py shell
 from django.conf import settings
-from apps.dv_notify.metadata_updater import MetadataUpdater
-from apps.gis_tabular.models import WorldMapJoinLayerInfo
+from gc_apps.dv_notify.metadata_updater import MetadataUpdater
+from gc_apps.gis_tabular.models import WorldMapJoinLayerInfo
 wm_info = WorldMapJoinLayerInfo.objects.first()
 if wm_info is not None:
     mu = MetadataUpdater(settings.DATAVERSE_SERVER_URL)

geoconnect/apps/dv_notify/urls.py → geoconnect/gc_apps/dv_notify/urls.py

@@ -1,6 +1,6 @@
 from django.conf.urls import patterns, include, url
 
-urlpatterns = patterns('apps.dv_notify.views',
+urlpatterns = patterns('gc_apps.dv_notify.views',
 
    url(r'^shapefile-map/(?P<worldmapinfo_md5>\w{1,32})/$', 'ajax_dv_notify_shapefile_map', name="ajax_dv_notify_shapefile_map"),
 

geoconnect/apps/dv_notify/views.py → geoconnect/gc_apps/dv_notify/views.py

@@ -6,10 +6,10 @@
 
 from django.template import RequestContext
 from django.core.urlresolvers import reverse
-from apps.worldmap_connect.models import WorldMapLayerInfo
-from apps.dv_notify.metadata_updater import MetadataUpdater
-from apps.classification.utils import get_worldmap_info_object
-from apps.layer_types.static_vals import TYPE_SHAPEFILE_LAYER,\
+from gc_apps.worldmap_connect.models import WorldMapLayerInfo
+from gc_apps.dv_notify.metadata_updater import MetadataUpdater
+from gc_apps.classification.utils import get_worldmap_info_object
+from gc_apps.layer_types.static_vals import TYPE_SHAPEFILE_LAYER,\
                 TYPE_JOIN_LAYER,\
                 TYPE_LAT_LNG_LAYER
 from geo_utils.message_helper_json import MessageHelperJSON
@@ -82,8 +82,8 @@ def view_ajax_dv_notify_of_map(request, worldmap_layer_info):
 
 """
 import requests, json
-from apps.dv_notify.metadata_updater import MetadataUpdater
-from apps.gis_tabular.models import WorldMapJoinLayerInfo, WorldMapLatLngInfo
+from gc_apps.dv_notify.metadata_updater import MetadataUpdater
+from gc_apps.gis_tabular.models import WorldMapJoinLayerInfo, WorldMapLatLngInfo
 
 wm_info = WorldMapLatLngInfo.objects.get(pk=1)
 #MetadataUpdater.update_dataverse_with_metadata(wm_info)

geoconnect/apps/folium_maker/folium_converter.py → geoconnect/gc_apps/folium_maker/folium_converter.py

@@ -278,7 +278,7 @@ def make_leaflet_page(geojson_files=[], output_dir='.', output_html_fname='leafl
 
 
 if __name__=='__main__':
-    from apps.gis_shapefiles.models import ShapefileInfo
+    from gc_apps.gis_shapefiles.models import ShapefileInfo
     l = ShapefileInfo.objects.filter(id=0)
     if l.count() == 0:
         msgx('no files in database')

geoconnect/apps/folium_maker/models.py → geoconnect/gc_apps/folium_maker/models.py

@@ -1,7 +1,7 @@
 from django.db import models
 
-from apps.core.models import TimeStampedModel
-from apps.gis_basic_file.models import GISDataFile
+from gc_apps.core.models import TimeStampedModel
+from gc_apps.gis_basic_file.models import GISDataFile
 from .folium_directory_services import FoliumDirectoryHelper
 
 

geoconnect/apps/folium_maker/views.py → geoconnect/gc_apps/folium_maker/views.py

@@ -1,5 +1,5 @@
 from django.shortcuts import render
-from apps.gis_shapefiles.models import ShapefileInfo
+from gc_apps.gis_shapefiles.models import ShapefileInfo
 
 from folium_maker.folium_converter import FoliumConverter
 from django.contrib.auth.decorators import login_required

geoconnect/apps/gis_basic_file/admin.py → geoconnect/gc_apps/gis_basic_file/admin.py

@@ -1,8 +1,8 @@
 from django.contrib import admin
-from apps.gis_basic_file.models import GISDataFile
+from gc_apps.gis_basic_file.models import GISDataFile
 
 from shared_dataverse_information.dataverse_info.admin import DataverseInfoAdmin
-from apps.worldmap_connect.models import WorldMapImportAttempt
+from gc_apps.worldmap_connect.models import WorldMapImportAttempt
 
 
 class WorldMapImportAttemptInline(admin.TabularInline):

geoconnect/apps/gis_basic_file/dataverse_info_service.py → geoconnect/gc_apps/gis_basic_file/dataverse_info_service.py

@@ -6,7 +6,7 @@
     * https://github.com/cga-harvard/cga-worldmap/blob/e8554beda280aefc02e0b75d10613272a4ca2786/src/GeoNodePy/geonode/dataverse_info/forms.py
 """
 #from django.forms.models import model_to_dict
-from apps.gis_basic_file.models import GISDataFile
+from gc_apps.gis_basic_file.models import GISDataFile
 from shared_dataverse_information.dataverse_info.forms import DataverseInfoValidationForm
 
 
@@ -26,7 +26,7 @@ def get_dataverse_info_dict(gis_data_file):
     raise Exception('Dataverse Info is not valid')
 
 """
-from apps.gis_basic_file.dataverse_info_service import get_dataverse_info_dict
-from apps.gis_shapefiles.models import ShapefileInfo
+from gc_apps.gis_basic_file.dataverse_info_service import get_dataverse_info_dict
+from gc_apps.gis_shapefiles.models import ShapefileInfo
 s = ShapefileInfo.objects.all()[0]
 """

geoconnect/apps/gis_basic_file/forms.py → geoconnect/gc_apps/gis_basic_file/forms.py

@@ -1,6 +1,6 @@
 from django import forms
 
-from apps.gis_basic_file.models import GISDataFile
+from gc_apps.gis_basic_file.models import GISDataFile
 
 
 

geoconnect/apps/gis_basic_file/models.py → geoconnect/gc_apps/gis_basic_file/models.py

@@ -10,11 +10,11 @@
 from django.db import models
 from django.core.files.storage import FileSystemStorage
 from django.conf import settings
-from apps.core.models import TimeStampedModel
+from gc_apps.core.models import TimeStampedModel
 
-from apps.registered_dataverse.models import RegisteredDataverse
+from gc_apps.registered_dataverse.models import RegisteredDataverse
 from shared_dataverse_information.dataverse_info.models import DataverseInfo
-from apps.gis_basic_file.scratch_directory_services import ScratchDirectoryHelper
+from gc_apps.gis_basic_file.scratch_directory_services import ScratchDirectoryHelper
 
 dv_file_system_storage = FileSystemStorage(location=settings.DV_DATAFILE_DIRECTORY)
 

geoconnect/apps/gis_basic_file/tests.py → geoconnect/gc_apps/gis_basic_file/tests.py

@@ -5,7 +5,7 @@
 print settings.GISFILE_SCRATCH_WORK_DIRECTORY
 
 # make some directories
-from apps.gis_shapefiles.models import GISDataFile
+from gc_apps.gis_shapefiles.models import GISDataFile
 for g in GISDataFile.objects.all():
     g.get_scratch_work_directory()
 
@@ -18,7 +18,7 @@
         g.get_scratch_work_directory()
 
 # delete them
-from apps.gis_basic_file.scratch_directory_services import *
+from gc_apps.gis_basic_file.scratch_directory_services import *
 ScratchDirectoryHelper.clear_scratch_directories()
 
 

geoconnect/apps/gis_shapefiles/admin.py → geoconnect/gc_apps/gis_shapefiles/admin.py

@@ -1,8 +1,8 @@
 from django.contrib import admin
-from apps.gis_basic_file.admin import GISDataFileAdmin
+from gc_apps.gis_basic_file.admin import GISDataFileAdmin
 
-from apps.gis_shapefiles.models import ShapefileInfo, WorldMapShapefileLayerInfo
-from apps.gis_shapefiles.admin_forms import ShapefileInfoAdminForm
+from gc_apps.gis_shapefiles.models import ShapefileInfo, WorldMapShapefileLayerInfo
+from gc_apps.gis_shapefiles.admin_forms import ShapefileInfoAdminForm
 
 from geo_utils.admin_util import make_changelist_updates
 

geoconnect/apps/gis_shapefiles/forms.py → geoconnect/gc_apps/gis_shapefiles/forms.py

@@ -1,5 +1,5 @@
 from django import forms
-from apps.gis_shapefiles.models import ShapefileInfo
+from gc_apps.gis_shapefiles.models import ShapefileInfo
 
 
 class ShapefileInfoForm(forms.ModelForm):

geoconnect/apps/gis_shapefiles/initial_request_helper.py → geoconnect/gc_apps/gis_shapefiles/initial_request_helper.py

@@ -13,7 +13,7 @@
     FAILED_BAD_STATUS_CODE_FROM_WORLDMAP,\
     FAILED_TO_IDENTIFY_METADATA_MAPPING_TYPE
 
-from apps.layer_types.static_vals import is_valid_dv_type
+from gc_apps.layer_types.static_vals import is_valid_dv_type
 
 URL_PARAM_CALLBACK = 'cb'
 DV_DATA_KEY_MAPPING_TYPE = 'mapping_type'

geoconnect/apps/gis_shapefiles/models.py → geoconnect/gc_apps/gis_shapefiles/models.py

@@ -6,12 +6,12 @@
 
 import jsonfield # jsonfield.JSONField
 
-from apps.core.models import TimeStampedModel
-from apps.gis_basic_file.models import GISDataFile
+from gc_apps.core.models import TimeStampedModel
+from gc_apps.gis_basic_file.models import GISDataFile
 from geo_utils.fsize_human_readable import sizeof_fmt
 from geo_utils.json_field_reader import JSONHelper
-from apps.layer_types.static_vals import TYPE_SHAPEFILE_LAYER
-from apps.worldmap_layers.models import WorldMapLayerInfo
+from gc_apps.layer_types.static_vals import TYPE_SHAPEFILE_LAYER
+from gc_apps.worldmap_layers.models import WorldMapLayerInfo
 
 SHAPEFILE_EXTENSION_SHP = '.shp'
 SHAPEFILE_MANDATORY_EXTENSIONS = [SHAPEFILE_EXTENSION_SHP, '.shx', '.dbf',]

geoconnect/apps/gis_shapefiles/shapefile_examine_util.py → geoconnect/gc_apps/gis_shapefiles/shapefile_examine_util.py

@@ -10,9 +10,9 @@
 """
 from django.conf import settings
 
-from apps.gis_shapefiles.forms import ShapefileInfoForm
-from apps.gis_shapefiles.models import ShapefileInfo, WORLDMAP_MANDATORY_IMPORT_EXTENSIONS
-from apps.gis_shapefiles.shapefile_zip_check import ShapefileZipCheck
+from gc_apps.gis_shapefiles.forms import ShapefileInfoForm
+from gc_apps.gis_shapefiles.models import ShapefileInfo, WORLDMAP_MANDATORY_IMPORT_EXTENSIONS
+from gc_apps.gis_shapefiles.shapefile_zip_check import ShapefileZipCheck
 
 
 

geoconnect/apps/gis_shapefiles/shapefile_zip_check.py → geoconnect/gc_apps/gis_shapefiles/shapefile_zip_check.py

@@ -5,7 +5,7 @@
 import zipfile
 import cStringIO
 
-from apps.gis_shapefiles.models import WORLDMAP_MANDATORY_IMPORT_EXTENSIONS, SHAPEFILE_EXTENSION_SHP
+from gc_apps.gis_shapefiles.models import WORLDMAP_MANDATORY_IMPORT_EXTENSIONS, SHAPEFILE_EXTENSION_SHP
 from geo_utils.template_constants import ZIPCHECK_NO_SHAPEFILES_FOUND,\
         ZIPCHECK_MULTIPLE_SHAPEFILES,\
         ZIPCHECK_NO_FILE_TO_CHECK,\

geoconnect/apps/gis_shapefiles/shp_services.py → geoconnect/gc_apps/gis_shapefiles/shp_services.py

@@ -10,15 +10,15 @@
 from django.core.files.temp import NamedTemporaryFile
 
 from shared_dataverse_information.dataverse_info.forms import DataverseInfoValidationForm
-from apps.registered_dataverse.registered_dataverse_helper import find_registered_dataverse
+from gc_apps.registered_dataverse.registered_dataverse_helper import find_registered_dataverse
 
 from geo_utils.msg_util import msg, msgt
 from geo_utils.error_result_msg import ErrResultMsg,\
     FAILED_NOT_A_REGISTERED_DATAVERSE
 
-from apps.gis_shapefiles.models import ShapefileInfo
-from apps.worldmap_connect.models import WorldMapImportAttempt, WorldMapLayerInfo
-from apps.worldmap_connect.send_shapefile_service import SendShapefileService
+from gc_apps.gis_shapefiles.models import ShapefileInfo
+from gc_apps.worldmap_connect.models import WorldMapImportAttempt, WorldMapLayerInfo
+from gc_apps.worldmap_connect.send_shapefile_service import SendShapefileService
 
 import logging
 LOGGER = logging.getLogger(__name__)

geoconnect/gc_apps/gis_shapefiles/tests/__init__.py

@@ -0,0 +1,2 @@
+# import the tests
+#from gc_apps.gis_shapefiles.tests.test_shapefile_zip import *

geoconnect/apps/gis_shapefiles/tests/test_shapefile_zip.py → geoconnect/gc_apps/gis_shapefiles/tests/test_shapefile_zip.py

@@ -7,8 +7,8 @@
 from django.conf import settings
 
 from geo_utils.msg_util import *
-from apps.gis_shapefiles.shapefile_zip_check import ShapefileZipCheck
-from apps.gis_shapefiles.models import ShapefileInfo
+from gc_apps.gis_shapefiles.shapefile_zip_check import ShapefileZipCheck
+from gc_apps.gis_shapefiles.models import ShapefileInfo
 
 from geo_utils.template_constants import ZIPCHECK_NO_SHAPEFILES_FOUND,\
         ZIPCHECK_MULTIPLE_SHAPEFILES,\

geoconnect/apps/gis_shapefiles/urls.py → geoconnect/gc_apps/gis_shapefiles/urls.py

@@ -1,7 +1,7 @@
 from django.conf.urls import patterns, include, url
-from apps.gis_shapefiles.views_02_visualize import ViewAjaxVisualizeShapefile
+from gc_apps.gis_shapefiles.views_02_visualize import ViewAjaxVisualizeShapefile
 
-urlpatterns = patterns('apps.gis_shapefiles.views',
+urlpatterns = patterns('gc_apps.gis_shapefiles.views',
     url(r'^examine/$', 'view_examine_dataset', name="view_examine_dataset"),
 
     #url(r'^choose/(?P<shp_md5>\w{32})/$', 'view_choose_shapefile', name="view_choose_shapefile"),
@@ -16,7 +16,7 @@
 
 )
 
-urlpatterns += patterns('apps.gis_shapefiles.views_mapit',
+urlpatterns += patterns('gc_apps.gis_shapefiles.views_mapit',
     #url(r'^map-it/(?P<dv_session_token>\w{32})/$', 'view_mapit_incoming', name="view_mapit_incoming"),
 
     #url(r'^map-it/(?P<dataset_id>\d{1,10})/$', 'view_mapit_incoming_no_token', name="view_mapit_incoming_no_token"),
@@ -26,12 +26,12 @@
 )
 
 
-urlpatterns += patterns('apps.gis_shapefiles.views_02_visualize',
+urlpatterns += patterns('gc_apps.gis_shapefiles.views_02_visualize',
 
    url(r'^ajax-visualize/(?P<shp_md5>\w{1,32})/$', ViewAjaxVisualizeShapefile.as_view(), name="view_ajax_attempt_visualization"),
 )
 
-#urlpatterns += patterns('apps.gis_shapefiles.view_quick_test',
+#urlpatterns += patterns('gc_apps.gis_shapefiles.view_quick_test',
 #    url(r'^test-embed/?$', 'view_test_embed', name="view_test_embed"),
 #)