Merge pull request #823 from plajjan/531-backend/smart-parsing

Enhance smart parsing

.travis.yml

@@ -74,7 +74,7 @@ install:
     - if [ "$INSTALL" == "apt" ]; then wget -O - https://spritelink.github.io/NIPAP/nipap.gpg.key | sudo apt-key add -; fi
     - if [ "$INSTALL" == "apt" ]; then sudo apt-get update -qq; fi
     # install dependencies for installing & running nipap
-    - if [ "$INSTALL" == "apt" ]; then sudo apt-get install -qq -y --force-yes python-pysqlite2 python-psycopg2 python-ipy python-docutils postgresql-9.1 postgresql-9.1-ip4r python-tornado python-flask python-flask-xml-rpc python-flask-compress python-parsedatetime python-tz python-dateutil python-psutil; fi
+    - if [ "$INSTALL" == "apt" ]; then sudo apt-get install -qq -y --force-yes python-pysqlite2 python-psycopg2 python-ipy python-docutils postgresql-9.1 postgresql-9.1-ip4r python-tornado python-flask python-flask-xml-rpc python-flask-compress python-parsedatetime python-tz python-dateutil python-psutil python-pyparsing; fi
     # if we are testing the upgrade, first install NIPAP packages from official repo
     - if [ "$INSTALL" == "apt" ] && [ "$UPGRADE" == "true" ]; then sudo apt-get install -qq nipapd nipap-www nipap-cli; fi
     # bump version so that we know we are upgrading beyond what is installed

nipap-cli/nipap_cli/nipap_cli.py

@@ -169,7 +169,7 @@ def _parse_interp_pool(query, indent=-5, pandop=False):
     text = None
     text2 = None
     andop = False
-    if query['operator'] == 'and':
+    if interp['operator'] in ['and', 'or']:
         andop = True
     elif interp['interpretation'] == 'unclosed quote':
         text = "%s: %s, please close quote!" % (interp['string'], interp['interpretation'])
@@ -266,7 +266,7 @@ def _parse_interp_vrf(query, indent=-5, pandop=False):
     text = None
     text2 = None
     andop = False
-    if query['operator'] == 'and':
+    if interp['operator'] in ['and', 'or']:
         andop = True
     elif interp['interpretation'] == 'unclosed quote':
         text = "%s: %s, please close quote!" % (interp['string'], interp['interpretation'])
@@ -337,7 +337,7 @@ def _parse_interp_prefix(query, indent=-5, pandop=False):
     text = None
     text2 = None
     andop = False
-    if query['operator'] == 'and':
+    if interp['operator'] in ['and', 'or']:
         andop = True
     elif interp['interpretation'] == 'unclosed quote':
         text = "%s: %s, please close quote!" % (interp['string'], interp['interpretation'])

nipap/debian/control

@@ -17,7 +17,7 @@ Description: Neat IP Address Planner
 
 Package: nipapd
 Architecture: all
-Depends: debconf, nipap-common, python (>= 2.7), ${misc:Depends}, python-psycopg2, postgresql (>=9.1) | postgresql-9.1 | postgresql-9.2 | postgresql-9.3 | postgresql-9.4, postgresql-9.1-ip4r (>= 2.0) | postgresql-9.3-ip4r (>= 2.0) | postgresql-9.4-ip4r (>= 2.0), postgresql-contrib | postgresql-contrib-9.3, python-flask, python-flask-xml-rpc, python-flask-compress, python-tornado, python-parsedatetime, python-tz, python-dateutil, python-psutil
+Depends: debconf, nipap-common, python (>= 2.7), ${misc:Depends}, python-psycopg2, postgresql (>=9.1) | postgresql-9.1 | postgresql-9.2 | postgresql-9.3 | postgresql-9.4, postgresql-9.1-ip4r (>= 2.0) | postgresql-9.3-ip4r (>= 2.0) | postgresql-9.4-ip4r (>= 2.0), postgresql-contrib | postgresql-contrib-9.3, python-flask, python-flask-xml-rpc, python-flask-compress, python-tornado, python-parsedatetime, python-tz, python-dateutil, python-psutil, python-pyparsing
 Description: Neat IP Address Planner XML-RPC daemon
  The Neat IP Address Planner, NIPAP, is a system built for efficiently managing
  large amounts of IP addresses. This is the XML-RPC daemon.