zeitgeist team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 296
committer: Seif Lotfy <seif@xxxxxxxxx>
branch nick: bluebird
timestamp: Tue 2011-10-11 13:29:52 +0200
message:
  fixed mutliple symbol negation with children
modified:
  src/engine.vala


--
lp:~zeitgeist/zeitgeist/bluebird
https://code.launchpad.net/~zeitgeist/zeitgeist/bluebird

Your team Zeitgeist Framework Team is subscribed to branch lp:~zeitgeist/zeitgeist/bluebird.
To unsubscribe from this branch go to https://code.launchpad.net/~zeitgeist/zeitgeist/bluebird/+edit-subscription

=== modified file 'src/engine.vala'
--- src/engine.vala	2011-10-11 10:11:37 +0000
+++ src/engine.vala	2011-10-11 11:29:52 +0000
@@ -834,19 +834,6 @@
                     interpretations_table);
                 if (!subwhere.is_empty ())
                     where.extend (subwhere);
-                    
-                var temp_interpretation = template.interpretation;
-                var is_negated = parse_negation(ref temp_interpretation);
-                foreach (var interp in Symbol.get_all_children(temp_interpretation)) {
-                    string child = null;
-                    if (is_negated)
-                        child = "!"+ interp;
-                    subwhere = get_where_clause_for_symbol (
-                        "subj_interpretation", child,
-                        interpretations_table);
-                    if (!subwhere.is_empty ())
-                        where.extend (subwhere);
-                }
             }
 
             // Manifestation
@@ -903,19 +890,6 @@
                         interpretations_table);
                     if (!subwhere.is_empty ())
                         where.extend (subwhere);
-                        
-                    var temp_interpretation = subject_template.interpretation;
-                    var is_negated = parse_negation(ref temp_interpretation);
-                    foreach (var interp in Symbol.get_all_children(temp_interpretation)) {
-                        string child = null;
-                        if (is_negated)
-                            child = "!"+ interp;
-                        subwhere = get_where_clause_for_symbol (
-                            "subj_interpretation", child,
-                            interpretations_table);
-                        if (!subwhere.is_empty ())
-                            where.extend (subwhere);
-                    }
                 }
 
                 // Subject manifestation
@@ -1076,7 +1050,7 @@
     {
         string _symbol = symbol;
         bool negated = parse_negation (ref _symbol);
-        List<unowned string> symbols = Symbol.get_all_children (symbol);
+        List<unowned string> symbols = Symbol.get_all_children (_symbol);
         symbols.prepend (_symbol);
 
         WhereClause subwhere = new WhereClause(