Variable name misspelling fix: querry

routes/api/v1/api.go

@@ -167,7 +167,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 		m.Post("/markdown", bind(api.MarkdownOption{}), misc.Markdown)
 		m.Post("/markdown/raw", misc.MarkdownRaw)
 
-		m.Get("/search/:querry", search.Search)
+		m.Get("/search/:query", search.Search)
 
 		// Users
 		m.Group("/users", func() {
@@ -228,7 +228,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 			m.Get("/search", repo.Search)
 
 			m.Get("/:username/:reponame", repoAssignment(), repo.Get)
-			m.Get("/suggest/:querry", search.Suggest)
+			m.Get("/suggest/:query", search.Suggest)
 		})
 
 		m.Group("/repos", func() {

routes/api/v1/repo/repo.go

@@ -28,7 +28,7 @@ func Search(c *context.APIContext) {
 		Page:     c.QueryInt("page"),
 	}
 
-	// workaround for the all querry with logged users
+	// workaround for the all query with logged users
 	if opts.Keyword == "." {
 		opts.Keyword = ""
 	}

routes/api/v1/search/general.go

@@ -21,7 +21,7 @@ func Search(c *context.APIContext) {
 		return
 	}
 	ireq := libgin.SearchRequest{Token: c.GetCookie(setting.SessionConfig.CookieName), UserID: c.User.ID,
-		Querry: c.Params("querry"), CsrfT: c.GetCookie(setting.CSRFCookieName)}
+		Query: c.Params("query"), CsrfT: c.GetCookie(setting.CSRFCookieName)}
 	data, err := json.Marshal(ireq)
 	if err != nil {
 		c.Status(http.StatusInternalServerError)

routes/api/v1/search/suggest.go

@@ -17,7 +17,7 @@ func Suggest(c *context.APIContext) {
 		return
 	}
 	ireq := libgin.SearchRequest{Token: c.GetCookie(setting.SessionConfig.CookieName),
-		Querry: c.Params("querry"), CsrfT: c.GetCookie(setting.CSRFCookieName), SType: libgin.SEARCH_SUGGEST}
+		Query: c.Params("query"), CsrfT: c.GetCookie(setting.CSRFCookieName), SType: libgin.SEARCH_SUGGEST}
 	if c.IsLogged {
 		ireq.UserID = c.User.ID
 	}

routes/repo/editor.go

@@ -526,8 +526,8 @@ func UploadFilePost(c *context.Context, f form.UploadRepoFile) {
 func UploadFileToServer(c *context.Context) {
 	file, header, err := c.Req.FormFile("file")
 	fvalue := c.Req.Form
-	f_dir := filepath.Dir(fvalue.Get("full_path"))
-	log.Info("full_path:%s", f_dir)
+	fp := filepath.Dir(fvalue.Get("full_path"))
+	log.Info("full_path:%s", fp)
 	if err != nil {
 		c.Error(http.StatusInternalServerError, fmt.Sprintf("FormFile: %v", err))
 		return
@@ -557,7 +557,7 @@ func UploadFileToServer(c *context.Context) {
 		}
 	}
 
-	upload, err := models.NewUpload(filepath.Join(f_dir, header.Filename), buf, file)
+	upload, err := models.NewUpload(filepath.Join(fp, header.Filename), buf, file)
 	if err != nil {
 		c.Error(http.StatusInternalServerError, fmt.Sprintf("NewUpload: %v", err))
 		return

routes/search.go

@@ -26,7 +26,7 @@ func Search(c *context.Context, keywords string, sType int64) ([]byte, error) {
 	}
 
 	ireq := libgin.SearchRequest{Token: c.GetCookie(setting.SessionConfig.CookieName),
-		Querry: keywords, CsrfT: c.GetCookie(setting.CSRFCookieName), SType: sType, UserID: -10}
+		Query: keywords, CsrfT: c.GetCookie(setting.CSRFCookieName), SType: sType, UserID: -10}
 	if c.IsLogged {
 		ireq.UserID = c.User.ID
 	}
@@ -65,7 +65,7 @@ func ExploreData(c *context.Context) {
 	}
 	data, err := Search(c, keywords, sType)
 	if err != nil {
-		c.Handle(http.StatusInternalServerError, "Could not querry", err)
+		c.Handle(http.StatusInternalServerError, "Could not query", err)
 		return
 	}
 
@@ -112,6 +112,6 @@ type SearchRequest struct {
 	Token  string
 	CsrfT  string
 	UserID int64
-	Querry string
+	Query  string
 	SType  int64
 }

vendor/github.com/G-Node/libgin/libgin/dex.go

@@ -12,7 +12,7 @@ type SearchRequest struct {
 	Token  string
 	CsrfT  string
 	UserID int64
-	Querry string
+	Query  string
 	SType  int64
 }
 
@@ -20,7 +20,7 @@ const (
 	SEARCH_MATCH = iota
 	SEARCH_FUZZY
 	SEARCH_WILDCARD
-	SEARCH_QUERRY
+	SEARCH_QUERY
 	SEARCH_SUGGEST
 )