Removed @type, type from Person and moved actor from Person to Event …

…and DocumentInformationElement
HIIT · Feb 16, 2016 · b2a16ca · b2a16ca
1 parent 48e4b92
commit b2a16ca
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/JustUsed/DiMe Data/DiMeData.swift b/JustUsed/DiMe Data/DiMeData.swift
@@ -43,7 +43,6 @@ class DiMeBase: NSObject, Dictionariable {
     var theDictionary = [String: AnyObject]()
 
     override init() {
-        theDictionary["actor"] = "JustUsed"
         super.init()
     }
 

diff --git a/JustUsed/DiMe Data/DocumentInformationElement.swift b/JustUsed/DiMe Data/DocumentInformationElement.swift
@@ -91,6 +91,7 @@ class DocumentInformationElement: DiMeBase {
         theDictionary["title"] = NSURL(fileURLWithPath: histItem.path).lastPathComponent!
 
         // set dime-required fields
+        theDictionary["actor"] = "JustUsed"
         theDictionary["@type"] = "Document"
         theDictionary["type"] = "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo/#Document"
         theDictionary["isStoredAs"] = "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo/#LocalFileDataObject"

diff --git a/JustUsed/DiMe Data/Event.swift b/JustUsed/DiMe Data/Event.swift
@@ -39,6 +39,7 @@ class Event: DiMeBase {
         }
 
         // set dime-required fields (can be overwritten by subclasses)
+        theDictionary["actor"] = "JustUsed"
         theDictionary["@type"] = "Event"
         theDictionary["type"] = "http://www.hiit.fi/ontologies/dime/#Event"
     }

diff --git a/JustUsed/DiMe Data/HistoryManager.swift b/JustUsed/DiMe Data/HistoryManager.swift
@@ -147,6 +147,9 @@ class HistoryManager: NSObject {
                         // check if there is an "error" in the response. If so, log it, otherwise report success
                         if jres["error"] != nil {
                             AppSingleton.log.error("DiMe reported error:\n\(jres["error"].stringValue)")
+                            if let mes = jres["message"].string {
+                                AppSingleton.log.error("DiMe's error message:\n\(mes)")
+                            }
                         } else {
                             // TODO: remove this debugging check
                             let dimeResp = JSON(response.result.value!)

diff --git a/JustUsed/DiMe Data/Person.swift b/JustUsed/DiMe Data/Person.swift
@@ -116,10 +116,6 @@ class Person: DiMeBase {
             retDict["emailAccount"] = em
         }
 
-        // dime-required
-        retDict["@type"] = "Person"
-        retDict["type"] = "http://www.hiit.fi/ontologies/dime/#Person"
-
         return retDict
     }
 

diff --git a/JustUsed/Info.plist b/JustUsed/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1</string>
+	<string>1.1.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>4</string>
+	<string>5</string>
 	<key>LSApplicationCategoryType</key>
 	<string></string>
 	<key>LSMinimumSystemVersion</key>