merging

Author: nikitaeverywhere

cache/projectTemplate.xml

@@ -434,9 +434,17 @@ Method returns user application CSS.</Description>
 <ClassMethod>1</ClassMethod>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
+    #define CompileTime ##Expression("""" _ $zd($h, 11) _ ", "_ $zdt($NOW(0), 2,1) _ " GMT""")
     set %response.CharSet = "utf-8"
     set %response.ContentType = "text/css"
-    do ##class(StaticContent).Write("CSS")
+    do %response.SetHeader("Last-Modified", $$$CompileTime)
+   
+    if %request.GetCgiEnv("HTTP_IF_MODIFIED_SINCE")=$$$CompileTime {
+        do ..Http304()
+    } else {
+        do ##class(StaticContent).Write("CSS")
+    }
+    
     return $$$OK
 ]]></Implementation>
 </Method>
@@ -447,9 +455,17 @@ Method returns user application JavaScript.</Description>
 <ClassMethod>1</ClassMethod>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
+    #define CompileTime ##Expression("""" _ $zd($h, 11) _ ", "_ $zdt($NOW(0), 2,1) _ " GMT""")
     set %response.CharSet = "utf-8"
     set %response.ContentType = "text/javascript"
-    do ##class(StaticContent).Write("JS")
+    do %response.SetHeader("Last-Modified", $$$CompileTime)
+    
+    if %request.GetCgiEnv("HTTP_IF_MODIFIED_SINCE")=$$$CompileTime {
+        do ..Http304()
+    } else {
+        do ##class(StaticContent).Write("JS")
+    }
+    
     return $$$OK
 ]]></Implementation>
 </Method>
@@ -460,10 +476,29 @@ Method returns user application HTML.</Description>
 <ClassMethod>1</ClassMethod>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-    do ##class(StaticContent).Write("HTML")
+    #define CompileTime ##Expression("""" _ $zd($h, 11) _ ", "_ $zdt($NOW(0), 2,1) _ " GMT""")
+    do %response.SetHeader("Last-Modified", $$$CompileTime)
+        
+    if %request.GetCgiEnv("HTTP_IF_MODIFIED_SINCE")=$$$CompileTime {
+        do ..Http304()
+    } else {
+        do ##class(StaticContent).Write("HTML")
+    }
+    
     return $$$OK
 ]]></Implementation>
 </Method>
+
+<Method name="Http304">
+<Description>
+Issue an "304 Not Modified" status</Description>
+<ClassMethod>1</ClassMethod>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+    Set %response.Status="304 Not Modified"
+    Quit $$$OK
+]]></Implementation>
+</Method>
 </Class>
 
 

package.json

@@ -1,6 +1,10 @@
 {
   "name": "CacheUMLExplorer",
+<<<<<<< HEAD
   "version": "1.0.0",
+=======
+  "version": "0.15.1",
+>>>>>>> 59d55bd711e05c45ac628bff99372683be3b7378
   "description": "An UML Class explorer for InterSystems Caché",
   "directories": {
     "test": "test"