From 6f1f9695deedae9426e3537ef436aac7e0eb8ef5 Mon Sep 17 00:00:00 2001 From: cri Date: Sat, 12 Sep 2015 18:32:58 +0200 Subject: [PATCH 1/5] aggiunta ignore all tilde --- .gitignore | 11 +++++++++++ app/scripts/main.js~ | 34 ---------------------------------- 2 files changed, 11 insertions(+), 34 deletions(-) delete mode 100644 app/scripts/main.js~ diff --git a/.gitignore b/.gitignore index 290bd28..470ebfe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,14 @@ + +# ignore all bin directories +# matches "bin" in any subfolder +bin/ + +# ignore all target directories +target/ + +# ignore all files ending with ~ +*~ + .tmp bower_components node_modules diff --git a/app/scripts/main.js~ b/app/scripts/main.js~ deleted file mode 100644 index 5ccbee4..0000000 --- a/app/scripts/main.js~ +++ /dev/null @@ -1,34 +0,0 @@ -/*------------------------------------------------------------------------------------------------------------------------ - @package: arkiwiJsBoilerplate - - @author: cek - @www: arkiwi.oeg - - @copyright: COPYRIGHT 18 cek - @license: MIT - - ============================================================================= - Filename: main.js - ============================================================================= - This file is the main entry point for js on the arkiwiJsBoilerplate app. - --------------------------------------------------------------------------------------------------------------------- */ -$(document).ready(function () { - var arkiwi = new ARKIWI.Arkiwi('http://www.arkiwi.org'); - $.get("templates/list.txt", function (template) { - - arkiwi.path("XM24", function (listone) { - var dioporco = Mustache.render(template, listone); - }); -}); - - var arkiwi = new ARKIWI.Arkiwi('http://www.arkiwi.org'); - arkiwi.search('Ampioraggio', function (result) { - console.log('Ricerca...'); - console.log(result); - }); - - arkiwi.path('XM24', function (result) { - console.log('Lettura cartella...'); - console.log(result); - }, true); -}); From fc0c1d02981b46d5bd1ec4b6f208870f5af10999 Mon Sep 17 00:00:00 2001 From: cri Date: Sat, 12 Sep 2015 18:35:18 +0200 Subject: [PATCH 2/5] sincro file con quelle caricate sul server --- app/scripts/arkiwi.js | 4 +-- app/scripts/main.js | 76 ++++++++++++++++++++++++------------------- 2 files changed, 44 insertions(+), 36 deletions(-) diff --git a/app/scripts/arkiwi.js b/app/scripts/arkiwi.js index 8bd3d1b..27dbcca 100644 --- a/app/scripts/arkiwi.js +++ b/app/scripts/arkiwi.js @@ -149,7 +149,7 @@ ARKIWI.Arkiwi.prototype.close = function (callback) { ARKIWI.Arkiwi.prototype.path = function (path, callback, notBase64) { var pathType = notBase64 ? 'path' : 'path64'; - $.getJSON(this.endpoint + '/' + pathType + '/' + path + '/jsonml/?' + this.defaultParameters, function (result) { + $.getJSON(this.endpoint + '/' + pathType + '/' + path + '/json/?' + this.defaultParameters, function (result) { if (callback != undefined) callback(result); }).fail(function (error) { @@ -165,7 +165,7 @@ ARKIWI.Arkiwi.prototype.search = function (query, callback, jailFolder) { sanitizedQuery = window.btoa(sanitizedQuery); //convert to Base64 - $.getJSON(this.endpoint + '/search64/' + sanitizedQuery + '/jsonml/?' + this.defaultParameters, function (result) { + $.getJSON(this.endpoint + '/search64/' + sanitizedQuery + '/json/?' + this.defaultParameters, function (result) { if (callback != undefined) callback(result); }).fail(function (error) { diff --git a/app/scripts/main.js b/app/scripts/main.js index e3b74f4..66d1077 100644 --- a/app/scripts/main.js +++ b/app/scripts/main.js @@ -1,36 +1,44 @@ -/*------------------------------------------------------------------------------------------------------------------------ - @package: arkiwiJsBoilerplate - - @author: cek - @www: arkiwi.oeg - - @copyright: COPYRIGHT 18 cek - @license: MIT - - ============================================================================= - Filename: main.js - ============================================================================= - This file is the main entry point for js on the arkiwiJsBoilerplate app. - --------------------------------------------------------------------------------------------------------------------- */ -$(document).ready(function () { - var arkiwi = new ARKIWI.Arkiwi('http://www.arkiwi.org'); - $.get("templates/list.txt", function (template) { - - arkiwi.path("XM24", function (listone) { - var dioporco = Mustache.render(template, listone); +/*------------------------------------------------------------------------------------------------------------------------ + @package: arkiwiJsBoilerplate + + @author: cek + @www: arkiwi.oeg + + @copyright: COPYRIGHT 18 cek + @license: MIT + + ============================================================================= + Filename: main.js + ============================================================================= + This file is the main entry point for js on the arkiwiJsBoilerplate app. + --------------------------------------------------------------------------------------------------------------------- */ +$(document).ready(function () { + var arkiwi = new ARKIWI.Arkiwi('http://www.arkiwi.org'); + $.get("templates/list.txt", function (template) { + + arkiwi.path("XM24", function (listone) { + var dioporco = Mustache.render(template, listone); $(".row").append(dioporco); },true); -}); - - - var arkiwi = new ARKIWI.Arkiwi('http://www.arkiwi.org'); - arkiwi.search('Ampioraggio', function (result) { - console.log('Ricerca...'); - console.log(result); - }); - - arkiwi.path('XM24', function (result) { - console.log('Lettura cartella...'); - console.log(result); - }, true); -}); + + + +}); + + + + + + + +arkiwi.search('Ampioraggio', function (result) { + console.log('Ricerca...'); + console.log(result); + + }); + + arkiwi.path('XM24', function (result) { + console.log('Lettura cartella...'); + console.log(result); + }, true); +}); From 8db90782b1d85ebe94a05d907fb97839967bcf43 Mon Sep 17 00:00:00 2001 From: cri Date: Sat, 12 Sep 2015 18:39:51 +0200 Subject: [PATCH 3/5] aggiunti css bootstrap --- app/index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/app/index.html b/app/index.html index faf768d..b94d91c 100644 --- a/app/index.html +++ b/app/index.html @@ -22,6 +22,7 @@ + From 310ac6c869714a2347e1214de1e156554489ea39 Mon Sep 17 00:00:00 2001 From: cri Date: Sat, 12 Sep 2015 19:46:53 +0200 Subject: [PATCH 4/5] aggiunto appunti --- Doc | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 Doc diff --git a/Doc b/Doc new file mode 100644 index 0000000..c0f2d58 --- /dev/null +++ b/Doc @@ -0,0 +1,20 @@ +to do: +-schermata base dei file: audio e video e.. testo? + + +-create, comando per creare una sessione (che quindi fa parlare il cliente con l'access store) +-upload, invia un file all'access store +-metadata, crea o sovrascrive un metadata sull'AS [non va] +-removemetadata, cancella un metadatato dall' AS [non va] +-close, comando per chidere la sessione col server + + +#cercare nel codice ii commenti del cek + +Cose da interfacciare: + +- la ricerca +- il modifica metadati +- il visualizza metadati +- il carica un file, scrivi i metadati online + From f0e6df0f115dbf4e8795563c70b864e2754201ab Mon Sep 17 00:00:00 2001 From: cri Date: Sat, 12 Sep 2015 19:48:16 +0200 Subject: [PATCH 5/5] aggiunto appunti2 --- Doc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Doc b/Doc index c0f2d58..aa13e13 100644 --- a/Doc +++ b/Doc @@ -7,7 +7,8 @@ to do: -metadata, crea o sovrascrive un metadata sull'AS [non va] -removemetadata, cancella un metadatato dall' AS [non va] -close, comando per chidere la sessione col server - +-path, chiede all'aggregatore i metadati di un fileo cartella +-search, esegue una ricerca sull'aggregatore (pagliaio>>aggregatore) #cercare nel codice ii commenti del cek