From 37662bb946d4ad19d5750c8396cd94431fea9c7f Mon Sep 17 00:00:00 2001 From: TeriForey Date: Thu, 24 Jan 2019 13:50:18 +0000 Subject: [PATCH 1/5] Reset branch back to status on azerbini fork --- arches/app/models/entity.py | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/arches/app/models/entity.py b/arches/app/models/entity.py index 1a8b71e18e..ca755af081 100644 --- a/arches/app/models/entity.py +++ b/arches/app/models/entity.py @@ -30,14 +30,12 @@ from django.db import connection from django.db import transaction from django.core.files.uploadedfile import InMemoryUploadedFile, TemporaryUploadedFile -from django.core.files import File from arches.app.models.concept import Concept from arches.app.utils.betterJSONSerializer import JSONSerializer, JSONDeserializer from django.core.exceptions import ObjectDoesNotExist import __builtin__ import logging -import urllib class Entity(object): """ @@ -243,21 +241,6 @@ def _save(self): themodelinstance.save() self.value = themodelinstance.geturl() self.label = themodelinstance.getname() - else: - try: # Will download, open and upload file contents. If it's an S3 file, it will create a copy. - result = urllib.urlretrieve(self.value) - f = File(open(result[0], 'rb')) - if "AccessDenied" in f.read(): - raise Exception("File %s does not exist" % self.value) - f.seek(0) - themodelinstancefileattr = getattr(themodelinstance, columnname) - themodelinstancefileattr.save(self.label, f) - f.close() - themodelinstance.save() - self.value = themodelinstance.geturl() - self.label = themodelinstance.getname() - except: - pass for child_entity in self.child_entities: child = child_entity._save() From 446eba4bb08741a0aa8e2dd39e3e2f0d8700d16e Mon Sep 17 00:00:00 2001 From: TeriForey Date: Fri, 25 Jan 2019 15:37:00 +0000 Subject: [PATCH 2/5] Updated pyshp version in requirements.txt for SHP export --- arches/install/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arches/install/requirements.txt b/arches/install/requirements.txt index 9c38a2dc9a..7bf9f8a269 100644 --- a/arches/install/requirements.txt +++ b/arches/install/requirements.txt @@ -5,7 +5,7 @@ Pillow==2.4.0 rdflib unicodecsv pyyaml -pyshp +pyshp>=2.0.1 # Leave the following line commented so that pip install will ignore this # The installer uses the following line to download the proper version of ES From c128b49e5140f8d912549647c4d0a550aa16742f Mon Sep 17 00:00:00 2001 From: TeriForey Date: Fri, 25 Jan 2019 16:40:44 +0000 Subject: [PATCH 3/5] Added a warning to the search export to SHP that attributes will be truncated to 255 characters --- eamena/eamena/templates/search.htm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eamena/eamena/templates/search.htm b/eamena/eamena/templates/search.htm index 613d6a5d2f..ae02174d17 100755 --- a/eamena/eamena/templates/search.htm +++ b/eamena/eamena/templates/search.htm @@ -117,7 +117,7 @@
  • {% trans "View Popular Searches" %}
  • {% if 'edit' in user.user_groups %} -
  • {% trans "Export results to .SHP" %}
    • +
  • {% trans "Export results to .SHP" %}
  • {% trans "Export results to .CSV" %}
  • {% trans "Export results to .KML" %}
  • {% trans "Export results to .JSON" %}
    • From 7eb200ae11500683d9453d59925c2a139a0b4ab8 Mon Sep 17 00:00:00 2001 From: TeriForey Date: Mon, 28 Jan 2019 10:55:39 +0000 Subject: [PATCH 4/5] Changed the fields that are likely to be multivalent or large to a 255 character limit --- .../resource_export_mappings.json | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/eamena/eamena/source_data/business_data/resource_export_mappings.json b/eamena/eamena/source_data/business_data/resource_export_mappings.json index 61973d633d..76195b1e9a 100755 --- a/eamena/eamena/source_data/business_data/resource_export_mappings.json +++ b/eamena/eamena/source_data/business_data/resource_export_mappings.json @@ -650,32 +650,32 @@ {"field_name": "Geom_Cert","source": "field_map", "data_type":"str", "data_length":"128"}, {"field_name": "Loc_Cert","source": "field_map", "data_type":"str", "data_length":"128"}, {"field_name": "Topography","source": "field_map", "data_type":"str", "data_length":"128"}, - {"field_name": "Period","source": "field_map", "data_type":"str", "data_length":"128"}, - {"field_name": "Per_Cert","source": "field_map", "data_type":"str", "data_length":"128"}, - {"field_name": "Form","source": "field_map", "data_type":"str", "data_length":"128"}, - {"field_name": "Form_Cert","source": "field_map", "data_type":"str", "data_length":"128"}, - {"field_name": "Arrangement","source": "field_map", "data_type":"str", "data_length":"128"}, - {"field_name": "Feature_No","source": "field_map", "data_type":"str", "data_length":"128"}, - {"field_name": "Feat_Shape","source": "field_map", "data_type":"str", "data_length":"128"}, - {"field_name": "Interpretation","source": "field_map", "data_type":"str", "data_length":"128"}, - {"field_name": "Inter_Cert","source": "field_map", "data_type":"str", "data_length":"128"}, - {"field_name": "Inter_No","source": "field_map", "data_type":"str", "data_length":"128"}, + {"field_name": "Period","source": "field_map", "data_type":"str", "data_length":"255"}, + {"field_name": "Per_Cert","source": "field_map", "data_type":"str", "data_length":"255"}, + {"field_name": "Form","source": "field_map", "data_type":"str", "data_length":"255"}, + {"field_name": "Form_Cert","source": "field_map", "data_type":"str", "data_length":"255"}, + {"field_name": "Arrangement","source": "field_map", "data_type":"str", "data_length":"255"}, + {"field_name": "Feature_No","source": "field_map", "data_type":"str", "data_length":"255"}, + {"field_name": "Feat_Shape","source": "field_map", "data_type":"str", "data_length":"255"}, + {"field_name": "Interpretation","source": "field_map", "data_type":"str", "data_length":"255"}, + {"field_name": "Inter_Cert","source": "field_map", "data_type":"str", "data_length":"255"}, + {"field_name": "Inter_No","source": "field_map", "data_type":"str", "data_length":"255"}, {"field_name": "Condition","source": "field_map", "data_type":"str", "data_length":"128"}, {"field_name": "Dist_Extent","source": "field_map", "data_type":"str", "data_length":"128"}, - {"field_name": "Dist_Type","source": "field_map", "data_type":"str", "data_length":"128"}, - {"field_name": "Dist_Cause","source": "field_map", "data_type":"str", "data_length":"128"}, - {"field_name": "DistCauseCert","source": "field_map", "data_type":"str", "data_length":"128"}, - {"field_name": "DistDateBefore","source": "field_map", "data_type":"str", "data_length":"128"}, - {"field_name": "DistDateOn","source": "field_map", "data_type":"str", "data_length":"128"}, - {"field_name": "DistDateFrom","source": "field_map", "data_type":"str", "data_length":"128"}, - {"field_name": "DistDateTo","source": "field_map", "data_type":"str", "data_length":"128"}, - {"field_name": "DistEffect","source": "field_map", "data_type":"str", "data_length":"128"}, - {"field_name": "DistEffCert","source": "field_map", "data_type":"str", "data_length":"128"}, + {"field_name": "Dist_Type","source": "field_map", "data_type":"str", "data_length":"255"}, + {"field_name": "Dist_Cause","source": "field_map", "data_type":"str", "data_length":"255"}, + {"field_name": "DistCauseCert","source": "field_map", "data_type":"str", "data_length":"255"}, + {"field_name": "DistDateBefore","source": "field_map", "data_type":"str", "data_length":"255"}, + {"field_name": "DistDateOn","source": "field_map", "data_type":"str", "data_length":"255"}, + {"field_name": "DistDateFrom","source": "field_map", "data_type":"str", "data_length":"255"}, + {"field_name": "DistDateTo","source": "field_map", "data_type":"str", "data_length":"255"}, + {"field_name": "DistEffect","source": "field_map", "data_type":"str", "data_length":"255"}, + {"field_name": "DistEffCert","source": "field_map", "data_type":"str", "data_length":"255"}, {"field_name": "ThreatType","source": "field_map", "data_type":"str", "data_length":"128"}, {"field_name": "ThreatCause","source": "field_map", "data_type":"str", "data_length":"128"}, {"field_name": "ThrCauseCert","source": "field_map", "data_type":"str", "data_length":"128"}, {"field_name": "Desc_Type","source": "field_map", "data_type":"str", "data_length":"128"}, - {"field_name": "Description","source": "field_map", "data_type":"str", "data_length":"128"}, + {"field_name": "Description","source": "field_map", "data_type":"str", "data_length":"255"}, {"field_name": "Assessor","source": "field_map", "data_type":"str", "data_length":"128"} ], "RESOURCE_TYPES": { From eacdd80b5e4916687576a320fe77d12c201d5b16 Mon Sep 17 00:00:00 2001 From: michaeltfisher <41090686+michaeltfisher@users.noreply.github.com> Date: Fri, 15 Feb 2019 16:15:13 +0000 Subject: [PATCH 5/5] Add files via upload --- saved-searches.htm | 40 ++++++++++ search.htm | 187 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 227 insertions(+) create mode 100644 saved-searches.htm create mode 100644 search.htm diff --git a/saved-searches.htm b/saved-searches.htm new file mode 100644 index 0000000000..fbc7ae588a --- /dev/null +++ b/saved-searches.htm @@ -0,0 +1,40 @@ + +
    + +
    + +
    +
    +
    Sites in and around the Aleppo UNESCO WHS, Syria:
    +
    + +
    + +
    + +
    + +
    +
    +
    + +

    Aleppo Environs Heritage Places

    View a foundset of Heritage Places surrounding the Aleppo Citadel.

    +
    +
    + +
    +
    + +

    Aleppo Citadel UNESCO WHS Heritage Features

    View a foundset of Heritage Features within the UNESCO World Heritage Site of the Aleppo Citadel.

    +
    +
    + +
    +
    + +

    Complete Aleppo Dataset

    See all heritage sites so far identifed and registered through the UNITAR/UNOSAT - EAMENA collaboration

    +
    +
    +
    + + diff --git a/search.htm b/search.htm new file mode 100644 index 0000000000..11d65cdd17 --- /dev/null +++ b/search.htm @@ -0,0 +1,187 @@ +{% extends "base.htm" %} +{% load i18n %} +{% load staticfiles %} +{% block css %} + {{ block.super }} + +{% endblock css%} +{% block content %} + + +
    + + +
    +
    + + + +
    + +
    + {% if 'edit' in user.user_groups %} +
    + + + + +
    + {% endif %} +
    + {% if 'edit' in user.user_groups %} +
    + + +
    + {% endif %} +
    + + + + + +
    +
    + + + + + {% if 'edit' in user.user_groups %} + + + {% else %} + + {% endif %} + + + + + +
    +
    + +
    +
    + + +
    + + + + +
    + +
    + +

    +
    +
    + {% trans "Directed Searches:" %} +
    + +
    +

    + + + {% include 'views/saved-searches.htm' %} +
    + +
    + +

    +
    +
    + +
    + +
    +

    + + +
    +
    + {% include 'views/search/map-filter.htm' %} +
    + +
    +
    + {% include 'views/search/search-results.htm' %} +
    +
    +
    + +
    + +{% endblock content %}