Skip to content
This repository has been archived by the owner on Dec 29, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Swirrl/graftwerk
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: proDataMarket/graftwerk
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 6 commits
  • 15 files changed
  • 3 contributors

Commits on Mar 30, 2016

  1. Included UTM conversion support in Graftwerk back-end. Minor changes … 

    …to default namespace.
    @nvnikolov
    nvnikolov committed Mar 30, 2016

    Verified

    This commit was signed with the committer’s verified signature.
    addaleax Anna Henningsen
    GPG key ID: A94130F0BFC8EBE9
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f905452 View commit details

Commits on Apr 4, 2016

  1. Fixed Maven local repository issue when running build in Leiningen

    @nivemaham
    nivemaham committed Apr 4, 2016

    Verified

    This commit was signed with the committer’s verified signature.
    jasnell James M Snell
    GPG key ID: 7341B15C070877AC
    Verified
    Learn about vigilant mode
    Copy the full SHA
    bc23903 View commit details

Commits on Apr 18, 2016

  1. Custom functions in separate namespace

    @dinans
    dinans committed Apr 18, 2016

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    danielleadams Danielle Adams
    GPG key ID: D3A89613643B6201
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    43a33c7 View commit details

Commits on Apr 19, 2016

  1. Changed version of tabular_functions project in dependencies

    @dinans
    dinans committed Apr 19, 2016
    Copy the full SHA
    e2412f2 View commit details

Commits on Apr 20, 2016

  1. Changed dependency: tabular_functions newer version with fixed bug

    @dinans
    dinans committed Apr 20, 2016
    Copy the full SHA
    00fe06a View commit details

Commits on Apr 21, 2016

  1. Changed dependency tabular_functions, newer version

    @dinans
    dinans committed Apr 21, 2016
    Copy the full SHA
    bf605a9 View commit details
4 changes: 4 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -10,3 +10,7 @@ pom.xml
*.log
/.nrepl-port
/requires.edn
/graftwerk.iml
/graftwerk.log
/.idea
!/maven_repository/ww-geo-coords/ww-geo-coords/1.0/ww-geo-coords-1.0.jar
Binary file added maven_repository/ww-geo-coords/ww-geo-coords/1.0/ww-geo-coords-1.0.jar
View file
Binary file not shown.
1 change: 1 addition & 0 deletions maven_repository/ww-geo-coords/ww-geo-coords/1.0/ww-geo-coords-1.0.jar.md5
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bb539e1d9f7ccc49fd983a458eabfa7b
1 change: 1 addition & 0 deletions maven_repository/ww-geo-coords/ww-geo-coords/1.0/ww-geo-coords-1.0.jar.sha1
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8bcc016b722fc2ae07172f63cd7441b3fda63c6a
8 changes: 8 additions & 0 deletions maven_repository/ww-geo-coords/ww-geo-coords/1.0/ww-geo-coords-1.0.pom
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>ww-geo-coords</groupId>
<artifactId>ww-geo-coords</artifactId>
<version>1.0</version>
</project>
1 change: 1 addition & 0 deletions maven_repository/ww-geo-coords/ww-geo-coords/1.0/ww-geo-coords-1.0.pom.md5
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ce3b44d58d9304c24eeb41a19a1dcefb
1 change: 1 addition & 0 deletions maven_repository/ww-geo-coords/ww-geo-coords/1.0/ww-geo-coords-1.0.pom.sha1
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e077a3ead721e229541f8a3200aafaa0eab6cd06
12 changes: 12 additions & 0 deletions maven_repository/ww-geo-coords/ww-geo-coords/maven-metadata-local.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<metadata>
<groupId>ww-geo-coords</groupId>
<artifactId>ww-geo-coords</artifactId>
<versioning>
<release>1.0</release>
<versions>
<version>1.0</version>
</versions>
<lastUpdated>20160303130100</lastUpdated>
</versioning>
</metadata>
12 changes: 12 additions & 0 deletions maven_repository/ww-geo-coords/ww-geo-coords/maven-metadata.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<metadata>
<groupId>ww-geo-coords</groupId>
<artifactId>ww-geo-coords</artifactId>
<versioning>
<release>1.0</release>
<versions>
<version>1.0</version>
</versions>
<lastUpdated>20160404094532</lastUpdated>
</versioning>
</metadata>
1 change: 1 addition & 0 deletions maven_repository/ww-geo-coords/ww-geo-coords/maven-metadata.xml.md5
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
6a671a749d49e0229a4dfe670233b026
1 change: 1 addition & 0 deletions maven_repository/ww-geo-coords/ww-geo-coords/maven-metadata.xml.sha1
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3a9f22074c9a0546b144a951ae769fc779363d38
11 changes: 9 additions & 2 deletions namespace.edn
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
(ns graftwerk.pipeline

(:require [grafter.tabular :refer :all]
[clojure.string]
[clojure.string :refer [capitalize lower-case upper-case trim trim-newline triml trimr]]
[tabular_functions.datatypes :as datatypes]
[tabular_functions.pipeline :as new-tabular]
[grafter.rdf :refer [prefixer s]]
[grafter.rdf.templater :refer [graph]]
[grafter.vocabularies.rdf :refer :all]
@@ -9,4 +12,8 @@
[grafter.vocabularies.sdmx-attribute :refer :all]
[grafter.vocabularies.skos :refer :all]
[grafter.vocabularies.foaf :refer :all]
[grafter.vocabularies.dcterms :refer :all]))
[grafter.vocabularies.owl :refer :all]
[grafter.vocabularies.dcterms :refer :all])
(:import [gov.nasa.worldwind.geom.coords.UTMCoord]
[org.openrdf.model.impl.URIImpl])
)
7 changes: 5 additions & 2 deletions project.clj
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@

:license {:name "Eclipse Public License - v1.0 (c) 2016 Swirrl IT Ltd"
:url "https://www.eclipse.org/legal/epl-v10.html"}

:repositories {"local" ~(str (.toURI (java.io.File. "maven_repository")))}
:dependencies [[org.clojure/clojure "1.6.0"]
[ring-server "0.3.1"]
[com.taoensso/timbre "4.0.1"]
@@ -18,13 +18,16 @@
[environ "1.0.0"]
[compojure "1.3.2"]
[grafter/vocabularies "0.1.0"]
[grafterizer/tabular_functions "0.1.2"]
[ring/ring-defaults "0.1.3"]
[ring/ring-session-timeout "0.1.0"]
[ring-middleware-format "0.4.0"]
[noir-exception "0.2.3"]
[bouncer "0.3.2"]
[org.slf4j/slf4j-simple "1.6.1"]
[prone "0.8.0"]]
[prone "0.8.0"]
[ww-geo-coords "1.0"]
]

:min-lein-version "2.5.0"
:uberjar-name "graftwerk.jar"
13 changes: 10 additions & 3 deletions src/graftwerk/routes/evaluate.clj
View file
Original file line number Diff line number Diff line change
@@ -19,15 +19,22 @@
(def default-namespace-declaration
'(ns graftwerk.pipeline
(:require [grafter.tabular :refer :all]
[clojure.string]
[grafter.rdf :refer [prefixer]]
[clojure.string :refer [capitalize lower-case upper-case trim trim-newline triml trimr]]
[grafter.rdf :refer [prefixer s]]
[grafter.rdf.templater :refer [graph]]
[tabular_functions.datatypes :as datatypes]
[tabular_functions.pipeline :as new-tabular]
[grafter.vocabularies.rdf :refer :all]
[grafter.vocabularies.qb :refer :all]
[grafter.vocabularies.sdmx-measure :refer :all]
[grafter.vocabularies.sdmx-attribute :refer :all]
[grafter.vocabularies.skos :refer :all]
[grafter.vocabularies.dcterms :refer :all])))
[grafter.vocabularies.foaf :refer :all]
[grafter.vocabularies.owl :refer :all]
[grafter.vocabularies.dcterms :refer :all])
(:import [gov.nasa.worldwind.geom.coords.UTMCoord]
[org.openrdf.model.impl.URIImpl]
)))

(defn namespace-symbol
"Return the namespace name for the supplied namespace form"
24 changes: 0 additions & 24 deletions src/graftwerk/routes/pages.clj
View file

This file was deleted.