Patch for https connections

OpenGov-OpenData · Aug 25, 2017 · b84ef13 · b84ef13
1 parent 06ba579
commit b84ef13
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/source/src/org/ckan/ckan.java b/source/src/org/ckan/ckan.java
@@ -197,7 +197,14 @@ public void dispose(StepMetaInterface smi, StepDataInterface sdi) {
 	}
 
 	public boolean newDataStoreResorce(List<Field> fields) {
-		Client ckanClient = new Client( new Connection(ckanDomain), ckanApiKey);
+		int port;
+		if (ckanDomain.toLowerCase().startsWith("https://")) {
+			port = 443;
+		}
+		else {
+			port= 80;
+		}
+		Client ckanClient = new Client( new Connection(ckanDomain, port), ckanApiKey);
 
 		try {
 			DataStore ds = new DataStore();
@@ -239,7 +246,14 @@ public boolean newDataStoreResorce(List<Field> fields) {
 	}
 
 	public boolean uploadDataStore(List<LinkedHashMap<String, Object>> records) {
-		Client ckanClient = new Client( new Connection(ckanDomain), ckanApiKey);
+		int port;
+		if (ckanDomain.toLowerCase().startsWith("https://")) {
+			port = 443;
+		}
+		else {
+			port= 80;
+		}
+		Client ckanClient = new Client( new Connection(ckanDomain, port), ckanApiKey);
 
 		try {
 			DataStore ds = new DataStore();

diff --git a/source/src/org/ckan/ckanDialog.java b/source/src/org/ckan/ckanDialog.java
@@ -416,7 +416,7 @@ private void ok()
 		stepname = wStepname.getText(); // return value
 
 		String domain = wDomain.getText().trim();
-		if (!domain.startsWith("http://")) {
+		if (!domain.startsWith("http://") && !domain.startsWith("https://")) {
 			domain = "http://" + domain;
 		}
 		while (domain.endsWith("/")) {

diff --git a/steps/ckan-datastore-plugin/ckan_datastore.jar b/steps/ckan-datastore-plugin/ckan_datastore.jar