From c6554f89e7e803716fdb6a5e6b6195fc66d68b8e Mon Sep 17 00:00:00 2001 From: Alfredo Serafini Date: Tue, 28 Feb 2017 12:25:02 +0100 Subject: [PATCH 01/10] updated the CKAN record updated the CKAN record, adding metadata part --- src/apps.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/apps.json b/src/apps.json index a3c134b39..2b8dc58de 100755 --- a/src/apps.json +++ b/src/apps.json @@ -1366,6 +1366,9 @@ "Java", "PostgreSQL\\;confidence:80" ], + "meta": { + "generator": "ckan [\\d]\\.[\\d]\\.[\\d]" + }, "website": "ckan.org/" }, "ClickHeat": { From 4b480c655649d4d173c1590ed7260a0579c9a78c Mon Sep 17 00:00:00 2001 From: Alfredo Serafini Date: Mon, 6 Mar 2017 15:34:15 +0100 Subject: [PATCH 02/10] updated record CKAN updating record CKAN, as suggested in #1398 --- src/apps.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/apps.json b/src/apps.json index ca821064b..5e67d8d7a 100755 --- a/src/apps.json +++ b/src/apps.json @@ -6,7 +6,7 @@ ], "icon": "1and1.svg", "implies": "PHP", - "url": "/shop/catalog/browse\\?sessid=" + "url": "/shop/catalog/browse\\?sessid=", "website": "http://1and1.com" }, "1C-Bitrix": { @@ -1356,8 +1356,8 @@ 1 ], "headers": { - "Access-Control-Allow-Headers": "X-CKAN-API-KEY", - "Link": "; rel=shortlink" + "Access-Control-Allow-Headers": "X-CKAN-API-KEY\\;confidence:90", + "Link": "; rel=shortlink\\;confidence:90 }, "icon": "Ckan.png", "implies": [ @@ -1367,9 +1367,9 @@ "PostgreSQL\\;confidence:80" ], "meta": { - "generator": "ckan [\\d]\\.[\\d]\\.[\\d]" + "generator": "ckan.*?(\\d\\.\\d\\.\\d)?\\;version:\\1" }, - "website": "ckan.org/" + "website": "http://ckan.org/" }, "ClickHeat": { "cats": [ From 61518892adeca59d71bc65748d38fa072da487d1 Mon Sep 17 00:00:00 2001 From: Alfredo Serafini Date: Mon, 6 Mar 2017 16:37:20 +0100 Subject: [PATCH 03/10] updated / fixed CKAN definition fixed missing double quote in CKAN definition --- src/apps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apps.json b/src/apps.json index 5e67d8d7a..a4c0461f5 100755 --- a/src/apps.json +++ b/src/apps.json @@ -1357,7 +1357,7 @@ ], "headers": { "Access-Control-Allow-Headers": "X-CKAN-API-KEY\\;confidence:90", - "Link": "; rel=shortlink\\;confidence:90 + "Link": "; rel=shortlink\\;confidence:90" }, "icon": "Ckan.png", "implies": [ From 51695f6f32e1df6f30254c4f539b2c002e10bba3 Mon Sep 17 00:00:00 2001 From: Alfredo Serafini Date: Mon, 17 Apr 2017 17:03:36 +0200 Subject: [PATCH 04/10] updated CKAN record updated CKAN record --- src/apps.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/apps.json b/src/apps.json index a4c0461f5..c0224dd1c 100755 --- a/src/apps.json +++ b/src/apps.json @@ -1356,8 +1356,8 @@ 1 ], "headers": { - "Access-Control-Allow-Headers": "X-CKAN-API-KEY\\;confidence:90", - "Link": "; rel=shortlink\\;confidence:90" + "Access-Control-Allow-Headers": "X-CKAN-API-KEY", + "Link": "; rel=shortlink" }, "icon": "Ckan.png", "implies": [ @@ -1367,7 +1367,7 @@ "PostgreSQL\\;confidence:80" ], "meta": { - "generator": "ckan.*?(\\d\\.\\d\\.\\d)?\\;version:\\1" + "generator": "^ckan\\s+(\\d{1,}\\.\\d{1,}\\.\\d{1,})$" }, "website": "http://ckan.org/" }, From 1db2e7da3c03ddecafadf032ddaed86917e6a6d3 Mon Sep 17 00:00:00 2001 From: Alfredo Serafini Date: Fri, 19 May 2017 16:46:47 +0200 Subject: [PATCH 05/10] updated CKAN detection updated CKAN detection --- src/apps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apps.json b/src/apps.json index c0224dd1c..a1dd630a5 100755 --- a/src/apps.json +++ b/src/apps.json @@ -1367,7 +1367,7 @@ "PostgreSQL\\;confidence:80" ], "meta": { - "generator": "^ckan\\s+(\\d{1,}\\.\\d{1,}\\.\\d{1,})$" + "generator": "(?:)ckan\s+(\d{1,}\.\d{1,}\.\d{1,})(?:)" }, "website": "http://ckan.org/" }, From 4c3732e4896d02d862cc26f3db61fe8e5dfbf205 Mon Sep 17 00:00:00 2001 From: Alfredo Serafini Date: Fri, 19 May 2017 16:47:46 +0200 Subject: [PATCH 06/10] updated CKAN detection updated CKAN detection --- src/apps.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/apps.json b/src/apps.json index a1dd630a5..963a57a2d 100755 --- a/src/apps.json +++ b/src/apps.json @@ -1364,10 +1364,10 @@ "Python", "Solr", "Java", - "PostgreSQL\\;confidence:80" + "PostgreSQL" ], "meta": { - "generator": "(?:)ckan\s+(\d{1,}\.\d{1,}\.\d{1,})(?:)" + "generator": "(?:)ckan\s+(\\d{1,}\\.\\d{1,}\\.\\d{1,})(?:)" }, "website": "http://ckan.org/" }, From 9670e9aa5c32212e51b6f3403e7ea490568bd601 Mon Sep 17 00:00:00 2001 From: Alfredo Serafini Date: Fri, 19 May 2017 16:48:11 +0200 Subject: [PATCH 07/10] updated CKAN detection updated CKAN detection --- src/apps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apps.json b/src/apps.json index 963a57a2d..0c5e9e306 100755 --- a/src/apps.json +++ b/src/apps.json @@ -1367,7 +1367,7 @@ "PostgreSQL" ], "meta": { - "generator": "(?:)ckan\s+(\\d{1,}\\.\\d{1,}\\.\\d{1,})(?:)" + "generator": "(?:)ckan\\s+(\\d{1,}\\.\\d{1,}\\.\\d{1,})(?:)" }, "website": "http://ckan.org/" }, From 06286eb33b31952100546bd07f3387b13f27c8ef Mon Sep 17 00:00:00 2001 From: Alfredo Serafini Date: Fri, 19 May 2017 16:53:30 +0200 Subject: [PATCH 08/10] updated CKAN regex detection updated CKAN regex detection --- src/apps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apps.json b/src/apps.json index 0c5e9e306..12671a939 100755 --- a/src/apps.json +++ b/src/apps.json @@ -1367,7 +1367,7 @@ "PostgreSQL" ], "meta": { - "generator": "(?:)ckan\\s+(\\d{1,}\\.\\d{1,}\\.\\d{1,})(?:)" + "generator": "(?:)ckan(?:)" }, "website": "http://ckan.org/" }, From d5b727c76a70befde93da1e3ec656ffb89ab13e3 Mon Sep 17 00:00:00 2001 From: Alfredo Serafini Date: Sun, 21 May 2017 18:34:04 +0200 Subject: [PATCH 09/10] updating ckan detection updating ckan detection - trying to remove non-capturing groups --- src/apps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apps.json b/src/apps.json index 12671a939..f948a91f9 100755 --- a/src/apps.json +++ b/src/apps.json @@ -1367,7 +1367,7 @@ "PostgreSQL" ], "meta": { - "generator": "(?:)ckan(?:)" + "generator": "ckan" }, "website": "http://ckan.org/" }, From 0dbf154deed16607791903dcb4a46faf33902379 Mon Sep 17 00:00:00 2001 From: Alfredo Serafini Date: Sun, 21 May 2017 18:40:12 +0200 Subject: [PATCH 10/10] updating ckan detection updating ckan detection --- src/apps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apps.json b/src/apps.json index f948a91f9..7ad05197c 100755 --- a/src/apps.json +++ b/src/apps.json @@ -1367,7 +1367,7 @@ "PostgreSQL" ], "meta": { - "generator": "ckan" + "generator": ".*ckan.*" }, "website": "http://ckan.org/" },