Changeset 10142

Timestamp:

2005-06-17T10:51:52+12:00 (19 years ago)

Author:

kjdon

Message:

formattools.cpp

Location:

trunk/gsdl/src/recpt

Files:

• Makefile.in (modified) (1 diff)
• formattools.cpp (modified) (2 diffs)
• z3950proxy.cpp (modified) (1 diff)

trunk/gsdl/src/recpt/Makefile.in

@@ -379 +379 @@
     $(FASTCGI_OBJS) \
     ../mgpp/text/libtextin.a \
-    ../mgpp/lib/libmg.a ../../packages/yaz-1.9/lib/.libs/libyaz.a
+    ../mgpp/lib/libmg.a ../../packages/yaz2/lib/libyaz.a
 
 z3950server: $(Z3950_OBJS)
     @echo -e building z3950server
-    $(CXXLINK) $(Z3950_OBJS) $(LIBS)
+    $(CXXLINK) $(Z3950_OBJS) $(LIBS) -lxml2

trunk/gsdl/src/recpt/formattools.cpp

@@ -1329 +1329 @@
 
   // check for operator
-  if ((op_expr != "eq") && (op_expr != "ne")) {
+  if ((op_expr != "eq") && (op_expr != "ne") && (op_expr != "gt") &&
+     (op_expr != "ge") && (op_expr != "lt") && (op_expr != "le") && (op_expr != "==") && (op_expr != "!=") &&  (op_expr != ">") && (op_expr != ">=") && (op_expr != "<") && (op_expr != "<=") && (op_expr != "sw") && (op_expr != "ew")) {
     // not a valid operator
     return false;
@@ -1359 +1360 @@
                  const text_t& rhs_expr, ostream& logout)
 {
-  if (op_expr == "eq") {
-    return (lhs_expr == rhs_expr);
-  }
-  else if (op_expr == "ne" ) {
-    return (lhs_expr != rhs_expr);
-  }
+  if (op_expr == "eq") return (lhs_expr == rhs_expr);
+  else if (op_expr == "ne" ) return (lhs_expr != rhs_expr);
+  else if (op_expr == "gt") return (lhs_expr > rhs_expr);
+  else if (op_expr == "ge") return (lhs_expr >= rhs_expr);
+  else if (op_expr == "lt") return (lhs_expr < rhs_expr);
+  else if (op_expr == "le") return (lhs_expr <= rhs_expr);
+  else if (op_expr == "==") return (lhs_expr.getint() == rhs_expr.getint());
+  else if (op_expr == "!=") return (lhs_expr.getint() != rhs_expr.getint());
+  else if (op_expr == ">") return (lhs_expr.getint() > rhs_expr.getint());
+  else if (op_expr == ">=") return (lhs_expr.getint() >= rhs_expr.getint());
+  else if (op_expr == "<") return (lhs_expr.getint() < rhs_expr.getint());
+  else if (op_expr == "<=") return (lhs_expr.getint() <= rhs_expr.getint());
+  else if (op_expr == "sw") return (starts_with(lhs_expr,rhs_expr));
+  else if (op_expr == "ew") return (ends_with(lhs_expr,rhs_expr));
   else {
     logout << "Error: '" << op_expr << "' is not a recognised operator." << endl;
   }
-
+  
   return false;
 }

trunk/gsdl/src/recpt/z3950proxy.cpp

@@ -30 +30 @@
 
 extern "C" {
+  //#include "yaz/yaz_zclient.h"
 #include "yaz/yaz_zclient.h"
 }