[Rt-commit] [svn] r1194 - rt/branches/rt-3.1/html/Search

[leira at pallas.eruditorum.org]

Author: leira
Date: Fri Jul  9 07:33:10 2004
New Revision: 1194

Modified:
   rt/branches/rt-3.1/html/Search/Build.html
Log:
RT-Ticket: 5814
RT-Status: resolved
RT-Action: correspond
New clauses are now on the top level by default, so blank lines won't appear unless you move something down a level on purpose (in which case, they're needed).

Toggling AND/OR now works correctly at all levels.


Modified: rt/branches/rt-3.1/html/Search/Build.html
==============================================================================
--- rt/branches/rt-3.1/html/Search/Build.html	(original)
+++ rt/branches/rt-3.1/html/Search/Build.html	Fri Jul  9 07:33:10 2004
@@ -242,22 +242,15 @@
 	my $newnode = Tree::Simple->new($clause);
 	if ($currentkey) {
 	    my $newindex = $currentkey->getIndex() + 1;
-	    if ($currentkey->getParent()->getParent()->isRoot()) {
-		my $newparent = Tree::Simple->new($ARGS{'AndOr'});
-		$newparent->addChild($newnode);
-		$newnode = $newparent;
-	    }
-	    else {
+	    if (!$currentkey->getParent->getParent()->isRoot()) {
 		$currentkey->getParent()->setNodeValue($ARGS{'AndOr'});
 	    }
 	    $currentkey->insertSibling($newindex, $newnode);
 	    $currentkey = $newnode;
 	}
 	else {
-	    my $newparent = Tree::Simple->new($ARGS{'AndOr'});
-	    $newparent->addChild($newnode);
-	    $tree->getChild(0)->addChild($newparent);
-	    $currentkey = $newparent;
+	    $tree->getChild(0)->addChild($newnode);
+	    $currentkey = $newnode;
 	}
     }
 }
@@ -357,21 +350,12 @@
 	my $value = $currentkey->getNodeValue();
 	my $parent = $currentkey->getParent();
 	my $parentvalue = $parent->getNodeValue();
-	if (ref($value)) {
-	    if ( $parentvalue eq 'AND') {
-		$parent->setNodeValue('OR');
-	    }
-	    else {
-		$parent->setNodeValue('AND');
-	    }
+
+	if ( $parentvalue eq 'AND') {
+            $parent->setNodeValue('OR');
 	}
-	else {
-	    if ($value eq 'AND') {
-		$currentkey->setNodeValue('OR');
-	    }
-	    else {
-		$currentkey->setNodeValue('AND');
-	    }
+        else {
+	    $parent->setNodeValue('AND');
 	}
     }
     else {