commit 7b4e4d9462efc5c8070e7a1868347288ba84c87a
author Akron <nils@diewald-online.de> Mon Sep 25 12:18:29 2017 +0200
committer Akron <nils@diewald-online.de> Mon Sep 25 16:10:14 2017 +0200
tree 14e55ac571c278d16f40b54c8d88a3aa67d4ff91
parent 182811ebaccf9a89f82d00e967838c960b431ffd

Enforce prefix on all dictionary entries

Change-Id: I0060de59503b2e4d3be95faa209c5e87a02dccb7

lib/Krawfish/Koral/Document.pm

diff --git a/lib/Krawfish/Koral/Document.pm b/lib/Krawfish/Koral/Document.pm
index b3745e2..8fc886a 100644
--- a/lib/Krawfish/Koral/Document.pm
+++ b/lib/Krawfish/Koral/Document.pm
@@ -316,6 +316,9 @@
     $term->value($item->{value});
   };
 
+  # Make token default term type
+  $term->term_type('token');
+
   return $term;
 
   #my $key = '';

lib/Krawfish/Koral/Query/Builder.pm

diff --git a/lib/Krawfish/Koral/Query/Builder.pm b/lib/Krawfish/Koral/Query/Builder.pm
index 107fdb5..722e986 100644
--- a/lib/Krawfish/Koral/Query/Builder.pm
+++ b/lib/Krawfish/Koral/Query/Builder.pm
@@ -1,4 +1,9 @@
 package Krawfish::Koral::Query::Builder;
+use strict;
+use warnings;
+
+use Krawfish::Util::Constants qw/:PREFIX/;
+
 use Krawfish::Koral::Query::Term;
 use Krawfish::Koral::Query::Token;
 use Krawfish::Koral::Query::Span;
@@ -62,7 +67,8 @@
 
 sub term {
   shift;
-  Krawfish::Koral::Query::Term->new(@_);
+  my $term = shift;
+  return Krawfish::Koral::Query::Term->new(TOKEN_PREF . $term);
 };
 
 sub term_neg {

lib/Krawfish/Koral/Query/Term.pm

diff --git a/lib/Krawfish/Koral/Query/Term.pm b/lib/Krawfish/Koral/Query/Term.pm
index 68a1cb5..cd65a4a 100644
--- a/lib/Krawfish/Koral/Query/Term.pm
+++ b/lib/Krawfish/Koral/Query/Term.pm
@@ -18,6 +18,9 @@
 #   a utility class Krawfish::Util::Koral::Term or so
 
 # TODO:
+#   Field is probably useless
+
+# TODO:
 #   Rename to_term to to_neutral!
 
 use constant DEBUG => 1;
@@ -113,7 +116,7 @@
     $_[0]->{prefix} = $_[1];
     return $_[0];
   };
-  $_[0]->{prefix};
+  $_[0]->{prefix} // TOKEN_PREF;
 };
 
 
@@ -131,11 +134,17 @@
       # Todo: This doesn't respect
       # direction
       $self->prefix(REL_L_PREF);
+    }
+    elsif ($_[0] eq 'token') {
+
+      # Todo: This doesn't respect
+      # direction
+      $self->prefix(TOKEN_PREF);
     };
     return $self;
   }
   else {
-    return 'token'     unless $self->prefix; # if $self->prefix eq TOKEN_PREF;
+    return 'token'     if $self->prefix eq TOKEN_PREF;
     return 'span'      if $self->prefix eq SPAN_PREF;
     return 'attribute' if $self->prefix eq ATTR_PREF;
     return 'relation';
@@ -308,7 +317,7 @@
   if ($str) {
     $str .= ':';
   };
-  $str .= $self->prefix if $self->prefix;
+  $str .= $self->prefix;
   my $term = $self->to_string;
   if ($self->operator ne '=') {
     $term =~ s/!?[=~]/=/;
@@ -325,7 +334,8 @@
 sub to_term_escaped {
   my $self = shift;
   my $term = $self->to_term;
-  if ($term =~ m!^((?:[^:]+?\:)?(?:[^/]+?\/)?(?:[^=]+?)\=)(.+?)$!) {
+  # (?:[^:]+?\:)?
+  if ($term =~ m!^(.(?:[^/]+?\/)?(?:[^=]+?)\=)(.+?)$!) {
     return quotemeta($1). $2;
   };
   return $term;

lib/Krawfish/Koral/Query/Token.pm

diff --git a/lib/Krawfish/Koral/Query/Token.pm b/lib/Krawfish/Koral/Query/Token.pm
index b054117..1b6af61 100644
--- a/lib/Krawfish/Koral/Query/Token.pm
+++ b/lib/Krawfish/Koral/Query/Token.pm
@@ -1,6 +1,7 @@
 package Krawfish::Koral::Query::Token;
 use parent 'Krawfish::Koral::Query';
 # use Krawfish::Koral::Query::Token;
+use Krawfish::Util::Constants qw/:PREFIX/;
 use Krawfish::Koral::Query::Term;
 # use Krawfish::Query::Term;
 use Krawfish::Log;
@@ -28,7 +29,7 @@
   # Token is a string
   unless (blessed $token) {
     return bless {
-      operands => [Krawfish::Koral::Query::Term->new($token)]
+      operands => [Krawfish::Koral::Query::Term->new(TOKEN_PREF . $token)]
     }, $class;
   };