Merge pull request #361 from readium/V1.12.0

V1.12.0 merged

Author: llemeurfr

.gitignore

@@ -10,12 +10,14 @@ debug
 *.lib
 *.exe
 *.yaml
+*.h
 !test/config.yaml
 **/manage/config.js
 frontend/manage/node_modules/*
 frontend/manage/dist/*
 frontend/manage/js/*
 frontend/manage/js/components/*
+license/user_key_prod.go
 *.map
 *.htpasswd
 lcpserver/test.sqllite

api/common_server.go

@@ -20,7 +20,7 @@ import (
 
 const (
 	// DO NOT FORGET to update the version
-	Software_Version = "1.10.0"
+	Software_Version = "1.12.0"
 
 	ContentType_LCP_JSON  = "application/vnd.readium.lcp.license.v1.0+json"
 	ContentType_LSD_JSON  = "application/vnd.readium.license.status.v1.0+json"

encrypt/notify_server.go

@@ -48,10 +48,10 @@ type CMSMsg struct {
 	DatePublished string   `json:"date_published"`
 	Description   string   `json:"description"`
 	CoverUrl      string   `json:"cover_url,omitempty"`
-	Language      []Coded  `json:"language"`
-	Publisher     []Entity `json:"publisher"`
-	Author        []Entity `json:"author"`
-	Category      []Entity `json:"category"`
+	Language      []Coded  `json:"language,omitempty"`
+	Publisher     []Entity `json:"publisher,omitempty"`
+	Author        []Entity `json:"author,omitempty"`
+	Category      []Entity `json:"category,omitempty"`
 }
 
 // NotifyLCPServer notifies the License Server of the encryption of a publication
@@ -238,13 +238,19 @@ func NotifyCMS(pub Publication, notifyURL string, verbose bool) error {
 	}
 	var en Entity
 	for _, en.Name = range pub.Publisher {
-		msg.Publisher = append(msg.Publisher, en)
+		if en.Name != "" {
+			msg.Publisher = append(msg.Publisher, en)
+		}
 	}
 	for _, en.Name = range pub.Author {
-		msg.Author = append(msg.Author, en)
+		if en.Name != "" {
+			msg.Author = append(msg.Author, en)
+		}
 	}
 	for _, en.Name = range pub.Subject {
-		msg.Category = append(msg.Category, en)
+		if en.Name != "" {
+			msg.Category = append(msg.Category, en)
+		}
 	}
 
 	var req *http.Request