Merge branch 'yentl' into windows-scripts

interface/HUTN/hutn_compiler/constructors_object_visitor.py

@@ -30,13 +30,14 @@ class ConstructorsObjectVisitor(ConstructorsVisitor):
 
         v = urllib2.urlopen(urllib2.Request(self.address, urllib.urlencode({"op": "get_output", "username": self.username}))).read()
         v = v.split("=", 2)[2]
+        simple_filename = self.real_file.rsplit("/")[-1]
         if v == "None":
             # Not defined, so recompile
-            print("[COMPILE] %s" % self.real_file.rsplit("/", 1)[1])
+            print("[COMPILE] %s" % simple_filename)
         else:
             # Is defined already, so let's compare hashes
             if v != self.hash_file:
-                print("[COMPILE] %s" % self.real_file.rsplit("/", 1)[1])
+                print("[COMPILE] %s" % simple_filename)
 
                 # Remove in Modelverse and recompile
                 urllib2.urlopen(urllib2.Request(self.address, urllib.urlencode({"op": "set_input", "element_type": "V", "value": '3', "username": self.username}))).read()
@@ -45,7 +46,7 @@ class ConstructorsObjectVisitor(ConstructorsVisitor):
             else:
                 self.visit = lambda i: i
                 self.dump = lambda: True
-                print("[CACHED] %s" % self.real_file.rsplit("/", 1)[1])
+                print("[CACHED] %s" % simple_filename)
 
     def dump(self):
         v = ConstructorsVisitor.dump(self)

interface/HUTN/hutn_compiler/primitives_object_visitor.py

@@ -29,13 +29,14 @@ class PrimitivesObjectVisitor(PrimitivesVisitor):
 
         v = urllib2.urlopen(urllib2.Request(self.address, urllib.urlencode({"op": "get_output", "username": self.username}))).read()
         v = v.split("=", 2)[2]
+        simple_filename = self.real_file.rsplit("/")[-1]
         if v == "None":
             # Not defined, so recompile
-            print("[COMPILE] %s" % self.real_file.rsplit("/", 1)[1])
+            print("[COMPILE] %s" % simple_filename)
         else:
             # Is defined already, so let's compare hashes
             if v != self.hash_file:
-                print("[COMPILE] %s" % self.real_file.rsplit("/", 1)[1])
+                print("[COMPILE] %s" % simple_filename)
 
                 # Remove in Modelverse and recompile
                 urllib2.urlopen(urllib2.Request(self.address, urllib.urlencode({"op": "set_input", "element_type": "V", "value": '3', "username": self.username}))).read()
@@ -44,7 +45,7 @@ class PrimitivesObjectVisitor(PrimitivesVisitor):
             else:
                 self.visit = lambda i: i
                 self.dump = lambda: True
-                print("[CACHED] %s" % self.real_file.rsplit("/", 1)[1])
+                print("[CACHED] %s" % simple_filename)
 
     def dump(self):
         v = PrimitivesVisitor.dump(self)