From 08634a8bb5d4e341956abc1ea4e9e2746199d6b4 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 25 Oct 2014 18:25:24 -0400
Subject: [PATCH] CLI

- Removed the 'ID/UUID or ID/UUID' processing from ::insertJunctions, as they
  are no longer needed, given ::insertIDExpr.
---
 src/CLI.cpp | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/src/CLI.cpp b/src/CLI.cpp
index 59cf6702f..9f1106946 100644
--- a/src/CLI.cpp
+++ b/src/CLI.cpp
@@ -1330,13 +1330,6 @@ void CLI::findOperators ()
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// Two consecutive FILTER, ID or UUID arguments:
-//
-//  ID ID             --> ID or ID
-//  ID UUID           --> ID or UUID
-//  UUID ID           --> UUID or ID
-//  UUID UUID         --> UUID or UUID
-//
 // Two consecutive FILTER, non-OP arguments that are not "(" or ")" need an
 // "and" operator inserted between them.
 //
@@ -1358,17 +1351,6 @@ void CLI::insertJunctions ()
       if (prev == _args.begin ())
         prev = a;
 
-      // Insert OR between consecutive FILTER ID/UUID args.
-      if (a != prev &&
-          (prev->hasTag ("ID") || prev->hasTag ("UUID")) &&
-          (a->hasTag ("ID") || a->hasTag ("UUID")))
-      {
-        A opOr ("argOp", "or");
-        opOr.tag ("FILTER");
-        opOr.tag ("OP");
-        reconstructed.push_back (opOr);
-      }
-
       // Insert AND between terms.
       else if (a != prev)
       {