prepare node.js

Author: pannous

bin/netbase

@@ -33,15 +33,19 @@ g++ $options  -I$JAVA_HOME/include/$arch -I$JAVA_HOME/include -g -w  src/*.cpp s
 
 if [[ $platform == 'Darwin' ]]; then
 	# g++ -fPIC -shared -I$JAVA_HOME/include/$arch -I$JAVA_HOME/include -lreadline -g -w  src/*.cpp src/jni/NetbaseJNI.cpp -o bin/libNetbase.so	
-	cp netbase blueprints-netbase/lib/mac/libNetbase.dylib
-	cp netbase blueprints-netbase/bin/netbase-mac
+	cp netbase lib/libNetbase.dylib
+	cp netbase bin/netbase-mac
 else
 	g++ -fPIC -shared -I$JAVA_HOME/include/$arch -I$JAVA_HOME/include -lreadline -g -w  src/*.cpp src/jni/NetbaseJNI.cpp -o bin/libNetbase.so	
-	cp netbase blueprints-netbase/bin
-	cp netbase blueprints-netbase/lib/linux/libNetbase.a
-	cp bin/libNetbase.so blueprints-netbase/lib/linux-x86-64/
-	cp bin/libNetbase.so blueprints-netbase/lib/linux/
+	cp netbase bin/
+	cp netbase lib/linux/
+	cp netbase lib/linux/libNetbase.a
+	cp bin/libNetbase.so lib/linux-x86-64/
+	cp bin/libNetbase.so lib/linux/
+	cp bin/libNetbase.so lib/
 fi
+# cp -r bin blueprints-netbase/
+# cp -r lib blueprints-netbase/
 # cd blueprints-netbase; git pull --all; git commit -a -m "Updated library" && git push --all && git status
 cd -
 

compile.sh

@@ -186,8 +186,17 @@ function clean(url){
 	return url;
 }
 
+function do_query(_query){
+	if(!_query)_query=query.value
+	var script = document.createElement('script');
+	script.src = 'http://de.netbase.pannous.com:81/js/'+_query // ?callback/jsonp=parseResults';
+	document.body.appendChild(script);
+	return false; // done
+}
+
 function parseResults(results0){
 	if(results0)results=results0;
+	if (typeof results == 'undefined'){console.log("NO results (yet?)!");return;}
 	// var results set via jsonp:
 	// <script src="http://de.netbase.pannous.com:81/js/verbose/gehren"></script>
 

netbase.js

@@ -277,6 +277,27 @@ extern "C" void initSharedMemory(bool relations) {
 	}
 }
 
+
+//static long shared_memory_2GB=2147483648;
+//static long shared_memory_4GB=4294967296;
+//static long shared_memory_6GB=6442450944;
+//static long shared_memory_8GB=8589934592;
+//static long shared_memory_16GB=17179869184;
+//static long shared_memory_32GB=34359738368;
+//static long shared_memory_64GB=68719476736;
+void setMemoryLimit(long maxNodes0,long maxStatements0,long maxChars0){
+//	void setMemoryLimit(long maxNodes0,long maxStatements0=-1,long maxChars0=-1){
+	if(maxNodes0>4294967296)error("sorry, 4 billion nodes is currently the limit of netbase");
+	maxNodes=maxNodes0; /*max 32bit=4 billion! */
+	if(maxStatements0>0) maxStatements=maxStatements0;
+	else	maxStatements = maxNodes*2;// *10 = crude average of Statements per Node (yago:12!!)
+	if(maxChars0>0) maxChars=maxChars0;
+	else	maxChars=maxNodes * averageNameLength;
+	bytesPerNode=(nodeSize+averageNameLength);//+ahashSize*2
+	sizeOfSharedMemory =contextOffset+ maxNodes*bytesPerNode+maxStatements*statementSize;
+	initSharedMemory(true);
+}
+
 extern "C" void init(bool relations) {
 	initSharedMemory(relations);
 }

netbase.xcodeproj/project.xcworkspace/xcuserdata/me.xcuserdatad/UserInterfaceState.xcuserstate

@@ -13,6 +13,7 @@ extern "C" void initSharedMemory(bool relations=true);
 extern "C" void init(bool relations); // synonym ^^
 //int semrm(key_t key, int id);
 int share_memory();
+void setMemoryLimit(long maxNodes0,long maxStatements0=-1,long maxChars0=-1);
 //char* share_memory(size_t key,long sizeOfSharedMemory,char* root,const void * desired);
 void* share_memory(size_t key, long sizeOfSharedMemory, void* root, const void * desired);
 void fixPointers();

src/init.cpp

@@ -1323,8 +1323,7 @@ Node * hasWord(const char* thingy,bool seo/*=false*/) {
 //	p("/////////////");
 	return 0;
 }
-
-
+	
 Node* number(int nr){
     bool tmp=autoIds;
     autoIds=false;

src/init.hpp

@@ -350,6 +350,11 @@ string join(char** argv, int argc) {
 	return a;
 }
 
+void error(string err){
+	printf("%s", err.data());
+	exit(0);
+}
+
 bool eq(int a,int b){
 	return a==b;// for assertEquals
 }
@@ -1144,4 +1149,4 @@ string generateSEOUrl(string input) {
 //	}
 
 	return s;
-}
+}

src/netbase.cpp

@@ -137,4 +137,5 @@ bool empty(cchar* c);
 int len(char* c);
 int len(cchar* c);
 int wordCount(char* c);
-string generateSEOUrl(string input);
+string generateSEOUrl(string input);
+void error(string err);

src/util.cpp

@@ -306,7 +306,8 @@ int handle(cchar* q0,int conn){
 	if (format == xml && (startsWith(q,"select")||contains(q," where "))){Writeline(conn,query2(q));return 0;}
 	if (format == xml)Writeline(conn, "<results>\n");
 	if (format == html)Writeline(conn,html_block);
-	if (use_json)Writeline(conn, "{\"results\":[\n");
+//	if (use_json)Writeline(conn, "{\"results\":[\n");
+	if (use_json)Writeline(conn, "{\"query\":\""+string(q)+"\", \"results\":[\n");
 	const char* statement_format_xml = "   <statement id='%d' subject=\"%s\" predicate=\"%s\" object=\"%s\" sid='%d' pid='%d' oid='%d'/>\n";
 	const char* statement_format_text = "   $%d %s %s %s %d->%d->%d\n";
 	const char* statement_format_json = "      { \"id\":%d, \"subject\":\"%s\", \"predicate\":\"%s\", \"object\":\"%s\", \"sid\":%d, \"pid\":%d, \"oid\":%d}";