add woql post

Author: Francesca-Bit

.npmignore

@@ -26,3 +26,5 @@ CHANGELOG.md
 .prettierrc
 .gitignore
 app.js
+
+.demo

.travis.yml

@@ -25,18 +25,16 @@ branches:
 before_deploy:
   - |
     if [[ ! $TRAVIS_VAR ]]; then
-      printf "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" >> ~/.npmrc
       npm run build
       echo "___TRAVIS_VAR____"
       export TRAVIS_VAR="1.$TRAVIS_BUILD_NUMBER"
-
       git commit --amend -m "[skip travis] version changed $PACKAGE_VERSION"
       git push https://${GITHUB_TOKEN}@github.com/$TRAVIS_REPO_SLUG HEAD:$TRAVIS_BRANCH
       git tag -f -a "$PACKAGE_VERSION" -m "new version $PACKAGE_VERSION"
       export LAST_HASH=$(git ls-remote https://github.com/$TRAVIS_REPO_SLUG $TRAVIS_BRANCH | awk '{ print $1}')
       echo $LAST_HASH
     fi
-#https://blog.travis-ci.com/2018-04-11-how_to_publish_node_js_packages_with_travis_ci_and_packagecloud/
+
 deploy:
   - provider: script
     skip_cleanup: true
@@ -55,10 +53,13 @@ deploy:
       branch: clientBuild 
       condition: $TRAVIS_COMMIT_MESSAGE == *"[run deploy]"*  
   - provider: npm
+    registry: "https://registry.npmjs.org/"
     skip_cleanup: true
+    access: public
     email: "[email protected]"
     api_key: $NPM_TOKEN
     keep_history: true
+    auth_method: "authToken"
     on:
       branch : clientBuild
       condition: $TRAVIS_COMMIT_MESSAGE == *"[run deploy]"*

demo/multiFile/multi.js

@@ -0,0 +1,65 @@
+
+var dbClient = new TerminusClient.WOQLClient();
+var connection=dbClient.connect("http://195.201.12.87:6365/", "connectors wanna plans compressed","rational_warehouse");
+
+var WOQL = TerminusClient.WOQL;
+
+(function () {
+	var fileCatcher = document.getElementById('file-catcher');
+  var fileInput = document.getElementById('file-input');
+  var fileListDisplay = document.getElementById('file-list-display');
+  
+  var fileList = [];
+  var renderFileList, sendFile;
+  
+  fileCatcher.addEventListener('submit', function (evnt) {
+  	evnt.preventDefault();
+    fileList.forEach(function (file) {
+    	sendFile(file);
+    });
+  });
+  
+  fileInput.addEventListener('change', function (evnt) {
+ 		fileList = [];
+
+    console.log("__FILELIST___",fileInput.files);
+
+  	for (var i = 0; i < fileInput.files.length; i++) {
+    	fileList.push(fileInput.files[i]);
+    }
+    renderFileList();
+  });
+  
+  renderFileList = function () {
+  	fileListDisplay.innerHTML = '';
+    fileList.forEach(function (file, index) {
+    	var fileDisplayEl = document.createElement('p');
+      fileDisplayEl.innerHTML = (index + 1) + ': ' + file.name;
+      fileListDisplay.appendChild(fileDisplayEl);
+
+      const query=WOQL.and(
+            WOQL.quad("v:Element","type","Class","schema"),
+            WOQL.opt().quad("v:Element","label","v:Label","schema"),
+            WOQL.opt().quad("v:Element","comment","v:Comment","schema"),
+            WOQL.opt().quad("v:Element","tcs:tag","v:Abstract","schema")
+            )
+
+      console.log(formData);
+    
+      query.execute(dbClient,formData);
+    });
+
+
+
+  };
+  
+  sendFile = function (file) {
+  	var formData = new FormData();
+    formData.set('file', file);
+
+    var request = new XMLHttpRequest();
+       
+    request.open("POST", 'https://localhost');
+    request.send(formData);
+  };
+})();

demo/multiFile/testMultiFile.html

@@ -0,0 +1,12 @@
+<script src="http://localhost/terminus-client/public_pages/1.1.2/dist/terminus-client.min.js"></script>
+
+
+<form id='file-catcher'>
+  <input id='file-input' type='file' multiple/>
+  <button type='submit'>
+    Submit
+  </button>
+</form>
+<div id='file-list-display'></div>
+
+<script src="multi.js"></script>

lib/woql.js

@@ -1869,7 +1869,7 @@ WOQLQuery.prototype.addStart = function(s){
 /**
  * Executes the query using the passed client to connect to a server
  */
-WOQLQuery.prototype.execute = function(client){
+WOQLQuery.prototype.execute = function(client,fileList){
 	if(!this.query["@context"]){
 		this.query['@context'] = client.connection.getJSONContext();
 		for(var pref in UTILS.standard_urls){
@@ -1882,12 +1882,14 @@ WOQLQuery.prototype.execute = function(client){
 		var json = this.json();
 	}
 	this.query["@context"]["_"] = "_:";		
+	const opts=fileList ? {fileList:fileList} : null;
 	if(this.contains_update){
-		return client.select(false, json);
+		return client.select(false, json,opts);
 		//return client.update(false, json);
 	}
 	else {
-		return client.select(false, json);
+		return client.select(false, json,opts);
+		//return client.update(false, json);
 	}
 }
 

lib/woqlClient.js

@@ -297,7 +297,9 @@ WOQLClient.prototype.select = function (qurl, woql, opts) {
 			new URIError(ErrorMessage.getInvalidURIMessage(qurl, 'Select'))
 		);
 	}
-	let q = { 'terminus:query': JSON.stringify(woql) };
+	const fileList = opts ? opts.fileList : {};
+	let q = {'terminus:query' : JSON.stringify(woql), ...fileList};
+
 	q = this.addOptionsToWOQL(q, opts);
 	return this.dispatch(this.connectionConfig.queryURL(), CONST.WOQL_SELECT, q);
 };
@@ -317,7 +319,10 @@ WOQLClient.prototype.update = function (qurl, woql, opts) {
 			new URIError(ErrorMessage.getInvalidURIMessage(qurl, 'Update'))
 		);
 	}
-	woql = this.addOptionsToWOQL(woql, opts);
+	//{fileName01,filePath,fileName02:filePath02....}
+	const fileList = opts ? opts.fileList : {};
+	let q = {'terminus:query' : JSON.stringify(woql), ...fileList};
+	q = this.addOptionsToWOQL(q, opts);
 	return this.dispatch(this.connectionConfig.queryURL(), 'woql_update', woql);
 };