MonetDB: Oct2012 - list: also strip off trailing _kind from docs

[Fabian Groffen]

Changeset: 6f4b46aee5b8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6f4b46aee5b8
Modified Files:
        monetdb5/extras/jaql/jaqlfunc.mal
Branch: Oct2012
Log Message:

list: also strip off trailing _kind from docs


diffs (24 lines):

diff --git a/monetdb5/extras/jaql/jaqlfunc.mal 
b/monetdb5/extras/jaql/jaqlfunc.mal
--- a/monetdb5/extras/jaql/jaqlfunc.mal
+++ b/monetdb5/extras/jaql/jaqlfunc.mal
@@ -131,7 +131,10 @@ function list()(kind:bat[:oid,:bte],stri
        bats := bbp.getNames();
        docs := pcre.select("json_.*_kind", bats);
 
-       jdocs := batstr.string(docs, 5);
+       lens := batstr.length(docs);
+       lens := batcalc.-(lens, 10);
+       offs := algebra.project(lens, 6);
+       docs := batstr.substring(docs, offs, lens);
 
        # in the future we could try to list some info about the document
        # here, like size
@@ -145,7 +148,7 @@ function list()(kind:bat[:oid,:bte],stri
        r7 := bat.new(:oid,:str);
 
        r1 := bat.insert(r1, 0@0, 97:bte); # a
-       r2 := algebra.markH(jdocs, 1@0);
+       r2 := algebra.markH(docs, 1@0);
 
        t1 := algebra.project(r2, 115:bte); # s
        r1 := bat.insert(r1, t1);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list