Updated.

models/field-types.go

@@ -8,6 +8,7 @@ import (
     "database/sql"
     "database/sql/driver"
     "encoding/json"
+    log "github.com/Sirupsen/logrus"
 )
 
 type JSONDictionary map[string]interface{}
@@ -39,6 +40,7 @@ func (p *JSONDictionary) Scan(src interface{}) error {
 
 func (p JSONDictionary) Value() (driver.Value, error) {
     j, err := json.Marshal(p)
+    log.Debugln("JSONDictionary.Value:>",j, ":::",err)
     return j, err
 }
 
@@ -59,6 +61,7 @@ func (p *JSONDictionaryArray) Scan(src interface{}) error {
 
 func (p JSONDictionaryArray) Value() (driver.Value, error) {
     j, err := json.Marshal(p)
+    log.Debugln("JSONDictionaryArray.Value:>",j, ":::",err)
     return j, err
 }
 
@@ -137,8 +140,13 @@ func (p *StringArray) Scan(src interface{}) error {
 }
 
 func (p StringArray) Value() (driver.Value, error) {
-    j, err := json.Marshal(p)
-    return j, err
+    var ss []string
+    for _, s := range p {
+        ss = append(ss, fmt.Sprintf(`"%s"`,s))
+    }
+    return strings.Join([]string{"{",strings.Join(ss, ","),"}"},""), nil
+    //j, err := json.Marshal(p)
+    //return j, err
 }
 
 

models/metas/album.go

@@ -9,15 +9,15 @@ const VODALBUM = "metas_vod_albums"
 type VodAlbum struct {
     Id            string `json:"id,omitempty" xql:"id,pk"`
     AlbumName     string `json:"albumName"`
-    Index         int `json:"index" xql:"idx"`
+    Index         int `json:"index,omitempty" xql:"idx"`
     IsSeries      bool `json:"isSeries"`
     FilmTotal     int `json:"filmTotal"`
     FilmCount     int `json:"filmCount"`
     Remark        string `json:"remark"`
-    IssueDate     string `json:"issueDate"`
-    PublishTime   *time.Time `json:"publishTime"`
+    IssueDate     string `json:"issueDate,omitempty"`
+    PublishTime   *time.Time `json:"publishTime,omitempty"`
     Score         float32 `json:"score"`
-    ContentRating string `json:"contentRating"`
+    ContentRating string `json:"contentRating,omitempty"`
     AlbumPicture  string `json:"albumPicture" xql:"album_pic"`
     ProviderId    string `json:"providerId,omitempty"`
     ImdbId        string `json:"imdbId"`
@@ -71,7 +71,7 @@ const VODCREW = "metas_vod_crews"
 
 type VodCrew struct {
     Id          string `json:"id,omitempty" xql:"id,pk"`
-    FullName    string `json:"fullName" xql:"fullname"`
+    FullName    string `json:"fullName" xql:"full_name"`
     FirstName   string `json:"firstName"`
     MiddleName  string `json:"middleName"`
     LastName    string `json:"lastName"`

models/published/vod.go

@@ -4,7 +4,7 @@ import (
     "errors"
     "encoding/json"
     "database/sql/driver"
-    "time"
+    //"time"
     "cygnux/kepler/models"
     "cygnux/kepler/models/metas"
 )
@@ -63,21 +63,21 @@ type PublishedVodCategory struct {
 const PUBLISHEDVODALBUM = "published_vod_albums"
 
 type PublishedVodAlbum struct {
-    metas.VodAlbum
+    metas.VodAlbum  `xql:"skips:ProviderId;"`
     //Id            string `json:"id"`
     //AlbumName     string `json:"albumName"`
-    //NameInitials  string `json:"-" xql:"name_initials"`
+    NameInitials  string `json:"nameInitials,omitempty" xql:"name_initials"`
     //IsSeries      bool `json:"isSeries"`
     //FilmTotal     int `json:"filmTotal"`
     //FilmCount     int `json:"filmCount"`
     //FilmIndex     int `json:"filmIndex"`
     //Remark        string `json:"remark"`
     //Index         int `json:"-" xql:"idx"`
-    Duration      int `json:"duration"`
-    Played        int64 `json:"played"`
-    Viewed        int64 `json:"viewed"`
+    Duration      int `json:"duration" xql:"-"`
+    Played        int64 `json:"played" xql:"-"`
+    Viewed        int64 `json:"viewed" xql:"-"`
     //AlbumPicture  string `json:"albumPicture"`
-    Language      string `json:"language"`
+    Language      string `json:"language" xql:"-"`
     //IssueDate     string `json:"issueDate,omitempty"`
     //PublishTime   *time.Time `json:"publishTime,omitempty"`
     //Score         float32 `json:"score,omitempty"`
@@ -89,11 +89,11 @@ type PublishedVodAlbum struct {
     Crews         models.JSONDictionary `json:"crews,omitempty"`
     Videos        models.JSONDictionaryArray `json:"videos,omitempty" xql:"-"`
     ScreenShots   models.StringArray `json:"screenShots,omitempty" xql:"-"`
-    VIPInfo       models.JSONDictionary `json:"vipInfo,omitempty" xql:"-"`
+    VIPInfo       models.JSONDictionary `json:"vipInfo,omitempty" xql:"vip_info"`
     PlayControl   models.JSONDictionary `json:"playCtrl,omitempty" xql:"-"`
     //Description   string `json:"description,omitempty"`
     //Created       *time.Time `json:"created,omitempty"`
-    Updated       *time.Time `json:"updated,omitempty"`
+    //Updated       *time.Time `json:"updated,omitempty"`
     Films         interface{} `json:"films,omitempty" xql:"-"`
     RelatedAlbums interface{} `json:"relatedAlbums,omitempty" xql:"-"`
 }
@@ -101,9 +101,9 @@ type PublishedVodAlbum struct {
 const PUBLISHEDVODFILM = "published_vod_films"
 
 type PublishedVodFilm struct {
-    metas.VodFilm
-    AlbumId     string `json:"albumId"`
-    //FilmId      string `json:"filmId"`
+    metas.VodFilm `xql:"skips:Id;"`
+    AlbumId     string `json:"albumId" xql:"album_id,pk"`
+    FilmId      string `json:"filmId" xql:"film_id,pk"`
     //FilmName    string `json:"filmName"`
     Index       int `json:"index" xql:"idx"`
     //Duration    int `json:"duration"`
@@ -113,7 +113,7 @@ type PublishedVodFilm struct {
     //Remark      string `json:"remark"`
     //Language    string `json:"language"`
     //IssueDate   string `json:"issueDate,omitempty"`
-    PlayControl models.JSONDictionary `json:"playCtrl,omitempty"`
+    PlayControl models.JSONDictionary `json:"playCtrl,omitempty" xql:"play_ctrl"`
     Crews       models.JSONDictionary `json:"crews,omitempty"`
     Videos      models.JSONDictionaryArray `json:"videos,omitempty"`
     ScreenShots models.StringArray `json:"screenShots,omitempty"`

pinyin/pinyin.go

@@ -1 +1,21 @@
 package pinyin
+
+func GetPinyin(s string) []string {
+    var pinyins []string
+    for _,x := range s {
+        if ss, ok := PINYIN_DATA[x]; ok {
+            pinyins = append(pinyins, ss)
+        }else{
+            pinyins = append(pinyins, string(x))
+        }
+    }
+    return pinyins
+}
+
+func GetPinyinInitial(s string) []string {
+    var initials []string
+    for _, x := range GetPinyin(s) {
+        initials = append(initials, string(x[0]))
+    }
+    return initials
+}

pinyin/pinyin_test.go

@@ -1 +1,19 @@
 package pinyin
+
+import (
+    "testing"
+)
+
+func TestGetPinyin(t *testing.T) {
+    s := "中华人民共和国 HELLO"
+    for _, x:= range GetPinyin(s) {
+        t.Log(">>>", x)
+    }
+}
+
+func TestGetPinyinInitial(t *testing.T) {
+    s := "中华人民共和国"
+    for _, x:= range GetPinyinInitial(s) {
+        t.Log(">>>", x)
+    }
+}