fixed absolute path shame and camelCase file names

DecentralCardGame · Aug 25, 2019 · 07e00ba · 07e00ba
1 parent b74a4d3
commit 07e00ba
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 2 deletions.
diff --git a/schema/abilityschema.json → schema/abilitySchema.json b/schema/abilityschema.json → schema/abilitySchema.json
diff --git a/schema/cardschema.json → schema/cardSchema.json b/schema/cardschema.json → schema/cardSchema.json
diff --git a/schema/effectschema.json → schema/effectSchema.json b/schema/effectschema.json → schema/effectSchema.json
diff --git a/schema/propertyschema.json → schema/propertySchema.json b/schema/propertyschema.json → schema/propertySchema.json
diff --git a/serializeCard.go b/serializeCard.go
@@ -1,6 +1,7 @@
 package cardobject
 
 import "fmt"
+//import "io/ioutil"
 import "github.com/xeipuuv/gojsonschema"
 import "encoding/json"
 
@@ -24,7 +25,10 @@ func ProcessCard (cardJson string) string {
 }
 
 func validateCard(s string) bool {
-    schemaLoader := gojsonschema.NewReferenceLoader("file://C:/Users/marius/Documents/goworkspace/src/github.com/DecentralCardGame/cardobject/schema/cardSchema.json")
+		//file, err := ioutil.ReadFile("schema/cardschema.json")
+		//fmt.Println(file)
+
+    schemaLoader := gojsonschema.NewReferenceLoader("file://schema/cardSchema.json")
     documentLoader := gojsonschema.NewStringLoader(s)
 
     result, err := gojsonschema.Validate(schemaLoader, documentLoader)
@@ -42,4 +46,4 @@ func validateCard(s string) bool {
         }
         return true//false
     }
-}
+}