diff --git a/assignment2/language.go b/assignment2/language.go index 8c838a72ecc6fb414ef7dc9b976f0e1ec680b4a8..f8cf74f3cd8fa00978764f6ab68b07edeee9598f 100644 --- a/assignment2/language.go +++ b/assignment2/language.go @@ -8,7 +8,13 @@ import ( "strconv" ) -// func Counter(S []string) map[string]int { +// func Counter(S []map[string]float64) map[string]int { +// //List := strings.Fields(S) +// count := make(map[string]int) +// for _, Lang := range S { +// _, ok := count[Lang] +// if ok { +// count[Lang] += 1func Counter(S []map[string]float64) map[string]int { // //List := strings.Fields(S) // count := make(map[string]int) // for _, Lang := range S { @@ -21,12 +27,18 @@ import ( // } // return count // } +// } else { +// count[Lang] = 1 +// } +// } +// return count +// } func HandlerLanguages(w http.ResponseWriter, r *http.Request) { var I []IDLang var L Language - var Code []CodeType + var Code []map[string]float64 URL1 := "https://git.gvk.idi.ntnu.no/api/v4/projects" // main url URL2 := "https://git.gvk.idi.ntnu.no/api/v4/projects?private_token=" // url for token @@ -41,6 +53,8 @@ func HandlerLanguages(w http.ResponseWriter, r *http.Request) { } + fmt.Println(URL3) + resp := DoRequest(Client, w, URL3) // request link PageTot, err := strconv.Atoi(resp.Header.Get("X-Total-Pages")) // gets count of total pages @@ -48,6 +62,7 @@ func HandlerLanguages(w http.ResponseWriter, r *http.Request) { http.Error(w, err.Error(), http.StatusBadRequest) return } + fmt.Println(PageTot) // *************************************************************** for i := 1; i <= PageTot; i++ { // loops true total pages URL := URL3 + "&page=" + strconv.Itoa(i) // sets url to one page @@ -76,7 +91,7 @@ func HandlerLanguages(w http.ResponseWriter, r *http.Request) { fmt.Println(URL) //**************************************************************** - var CodeTemp []CodeType + var CodeTemp map[string]float64 resp = DoRequest(Client, w, URL) // request link @@ -86,7 +101,7 @@ func HandlerLanguages(w http.ResponseWriter, r *http.Request) { return } - Code = append(Code, CodeTemp...) + Code = append(Code, CodeTemp) } diff --git a/assignment2/structs.go b/assignment2/structs.go index 7e16e7635b08a1243ff461cc5cd16b46afb5b650..2559df7a1bf174b37caeeeadd9df440303a2b668 100644 --- a/assignment2/structs.go +++ b/assignment2/structs.go @@ -28,8 +28,7 @@ type IDLang struct { } type CodeType struct { - Codes string - Num int + CodeMap map[string]float64 } type Language struct {