Fix small bug with request auto-detection

RivaSilvercrown · Jul 27, 2014 · c01f1aa · c01f1aa
1 parent fb8fbca
commit c01f1aa
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/example_application/src/example_site.py b/example_application/src/example_site.py
@@ -107,7 +107,6 @@ def getChildren(node):
 
 def node_to_object(node):
     returner = {}
-    print node.getStringValue()
     for child in getChildren(node):
         if child is None:
             continue
@@ -133,7 +132,6 @@ def execute(query):
         }
         returned_result.update(node_to_object(result))
         returner.append(returned_result)
-    print "%s results" % len(returner)
     return returner
 
 

diff --git a/xcat/lib/requests/detector.py b/xcat/lib/requests/detector.py
@@ -25,7 +25,9 @@ def change_parameter(self, target_parameter):
         :param target_parameter: A parameter name that the returned detector targets
         :return: A Detector that targets the given URI parameter
         """
-        return Detector(self.checker, copy.deepcopy(self.requests))
+        d = Detector(self.checker, copy.deepcopy(self.requests))
+        d.requests.set_target_parameter(target_parameter)
+        return d
 
     def get_requester(self, injector, features=None):
         requester = self.requests.with_injector(injector)

diff --git a/xcat/xcat.py b/xcat/xcat.py
@@ -70,7 +70,7 @@ def xcat(ctx, target, arguments, target_parameter, match_string, method, detecti
         OOBDocFeature.server = OOBHttpServer(host=public_ip, port=public_port)
 
     ctx.obj["target_param"] = target_parameter
-    request_maker = RequestMaker(target, method, arguments, target_parameter, checker=checker)
+    request_maker = RequestMaker(target, method, arguments, target_parameter if target_parameter != "*" else None, checker=checker)
     ctx.obj["detector"] = detector.Detector(checker, request_maker)