Extended reihen search

pages/suche.go

@@ -52,17 +52,14 @@ func (p *SuchePage) Setup(router *router.Router[*core.RequestEvent], app core.Ap
 			return engine.Response404(e, err, nil)
 		}
 
-		if paras.Query != "" {
-			switch paras.Collection {
-			case "baende":
-				return p.SimpleSearchBaendeRequest(app, engine, e, *paras)
-			case "beitraege":
-				return p.SimpleSearchReihenRequest(app, engine, e)
-			}
+		allparas, _ := NewSearchParameters(e, *paras)
+
+		if paras.Query != "" || allparas.IsBaendeSearch() {
+			return p.SearchBaendeRequest(app, engine, e, *allparas)
 		}
 
 		data := make(map[string]interface{})
-		data["parameters"] = paras
+		data["parameters"] = allparas
 		return engine.Response200(e, p.Template+paras.Collection+"/", data, p.Layout)
 	})
 
@@ -73,21 +70,17 @@ func (p *SuchePage) SimpleSearchReihenRequest(app core.App, engine *templating.E
 	return engine.Response404(e, nil, nil)
 }
 
-func (p *SuchePage) SimpleSearchBaendeRequest(app core.App, engine *templating.Engine, e *core.RequestEvent, pp Parameters) error {
+func (p *SuchePage) SearchBaendeRequest(app core.App, engine *templating.Engine, e *core.RequestEvent, params SearchParameters) error {
 	data := make(map[string]interface{})
-	params, err := NewSearchParameters(e, pp)
-	if err != nil {
-		return engine.Response404(e, err, nil)
-	}
 
-	result, err := SimpleSearchBaende(app, *params)
+	result, err := SimpleSearchBaende(app, params)
 	if err != nil {
 		return engine.Response404(e, err, nil)
 	}
 
 	data["parameters"] = params
 	data["result"] = result
-	return engine.Response200(e, p.Template+pp.Collection+"/", data, p.Layout)
+	return engine.Response200(e, p.Template+params.Collection+"/", data, p.Layout)
 }
 
 const (
@@ -177,11 +170,6 @@ type SearchParameters struct {
 }
 
 func NewSearchParameters(e *core.RequestEvent, p Parameters) (*SearchParameters, error) {
-	q := e.Request.URL.Query().Get(PARAM_QUERY)
-	if q == "" {
-		return nil, ErrNoQuery
-	}
-
 	alm := e.Request.URL.Query().Get(BAENDE_PARAM_ALM_NR) == "on"
 	title := e.Request.URL.Query().Get(BAENDE_PARAM_TITLE) == "on"
 	series := e.Request.URL.Query().Get(BAENDE_PARAM_SERIES) == "on"
@@ -191,6 +179,15 @@ func NewSearchParameters(e *core.RequestEvent, p Parameters) (*SearchParameters,
 	annotations := e.Request.URL.Query().Get(BAENDE_PARAM_ANNOTATIONS) == "on"
 	year := e.Request.URL.Query().Get(BAENDE_PARAM_YEAR) == "on"
 
+	almstring := e.Request.URL.Query().Get(BAENDE_PARAM_ALM_NR + "string")
+	titlestring := e.Request.URL.Query().Get(BAENDE_PARAM_TITLE + "string")
+	seriesstring := e.Request.URL.Query().Get(BAENDE_PARAM_SERIES + "string")
+	personsstring := e.Request.URL.Query().Get(BAENDE_PARAM_PERSONS + "string")
+	placesstring := e.Request.URL.Query().Get(BAENDE_PARAM_PLACES + "string")
+	refsstring := e.Request.URL.Query().Get(BAENDE_PARAM_REFS + "string")
+	annotationsstring := e.Request.URL.Query().Get(BAENDE_PARAM_ANNOTATIONS + "string")
+	yearstring := e.Request.URL.Query().Get(BAENDE_PARAM_YEAR + "string")
+
 	sort := e.Request.URL.Query().Get("sort")
 	if sort == "" {
 		sort = "year"
@@ -210,12 +207,36 @@ func NewSearchParameters(e *core.RequestEvent, p Parameters) (*SearchParameters,
 		Refs:   refs,
 		Year:   year,
 		Series: series,
+
+		// INFO: Expanded search
+		AlmString:         almstring,
+		TitleString:       titlestring,
+		SeriesString:      seriesstring,
+		PersonsString:     personsstring,
+		PlacesString:      placesstring,
+		RefsString:        refsstring,
+		AnnotationsString: annotationsstring,
+		YearString:        yearstring,
 	}, nil
 }
 
+func (p SearchParameters) AllSearchTerms() string {
+	q := p.Query + " " + p.AnnotationsString + " " + p.PersonsString + " " + p.TitleString + " " + p.AlmString + " " + p.SeriesString + " " + p.PlacesString + " " + p.RefsString + " " + p.YearString
+	return q
+}
+
 func (p SearchParameters) ToQueryParams() string {
-	if !p.Extended {
-		q := fmt.Sprintf("?q=%s", p.Query)
+	q := "?"
+
+	// TODO: use variables, url escape
+	if p.Extended {
+		q += "extended=true"
+	}
+
+	if p.Query != "" {
+		q += fmt.Sprintf("q=%s", p.Query)
+	}
+
 	if p.Alm {
 		q += "&alm=on"
 	}
@@ -240,12 +261,36 @@ func (p SearchParameters) ToQueryParams() string {
 	if p.Year {
 		q += "&year=on"
 	}
-		return q
+
+	if p.YearString != "" {
+		q += fmt.Sprintf("&yearstring=%s", p.YearString)
 	}
-	return ""
+	if p.AnnotationsString != "" {
+		q += fmt.Sprintf("&annotationsstring=%s", p.AnnotationsString)
+	}
+	if p.PersonsString != "" {
+		q += fmt.Sprintf("&personsstring=%s", p.PersonsString)
+	}
+	if p.TitleString != "" {
+		q += fmt.Sprintf("&titlestring=%s", p.TitleString)
+	}
+	if p.AlmString != "" {
+		q += fmt.Sprintf("&almstring=%s", p.AlmString)
+	}
+	if p.SeriesString != "" {
+		q += fmt.Sprintf("&seriesstring=%s", p.SeriesString)
+	}
+	if p.PlacesString != "" {
+		q += fmt.Sprintf("&placesstring=%s", p.PlacesString)
+	}
+	if p.RefsString != "" {
+		q += fmt.Sprintf("&refsstring=%s", p.RefsString)
 	}
 
-func (p SearchParameters) IsBeandeSearch() bool {
+	return q
+}
+
+func (p SearchParameters) IsBaendeSearch() bool {
 	return p.Collection == "baende" && (p.Query != "" || (p.AnnotationsString != "" || p.PersonsString != "" || p.TitleString != "" || p.AlmString != "" || p.SeriesString != "" || p.PlacesString != "" || p.RefsString != "" || p.YearString != ""))
 }
 
@@ -295,7 +340,6 @@ func (p SearchParameters) FieldSetBaende() []dbmodels.FTS5QueryRequest {
 		}
 	}
 
-	if p.IsExtendedSearch() {
 	if p.AnnotationsString != "" {
 		que := dbmodels.NormalizeQuery(p.AnnotationsString)
 		if len(que) > 0 {
@@ -375,7 +419,6 @@ func (p SearchParameters) FieldSetBaende() []dbmodels.FTS5QueryRequest {
 			})
 		}
 	}
-	}
 
 	return ret
 }

views/routes/suche/baende/body.gohtml

@@ -52,7 +52,6 @@
 {{ $isPersons := false }}
 {{ $isAnnotations := false }}
 
-{{ if $model.parameters.Query }}
 {{- $isAlm = or $model.parameters.Alm $model.parameters.AlmString -}}
 {{- $isTitle = or $model.parameters.Title $model.parameters.TitleString -}}
 {{- $isRefs = or $model.parameters.Refs $model.parameters.RefsString -}}
@@ -61,7 +60,6 @@
 {{- $isSeries = or $model.parameters.Series $model.parameters.SeriesString -}}
 {{- $isPersons = or $model.parameters.Persons $model.parameters.PersonsString -}}
 {{- $isAnnotations = or $model.parameters.Annotations $model.parameters.AnnotationsString -}}
-{{ end }}
 
 {{- $isBase := not (or $isAlm $isTitle $isRefs $isPlaces $isYear $isSeries $isPersons
 	$isAnnotations)
@@ -71,13 +69,13 @@
 <div id="searchcontrol" class="container-normal">
 	{{- template "_heading" $model.parameters -}}
 	<div id="" class="border-l border-zinc-300 px-8 py-10 relative">
-		{{- if not $model.parameters.Extended -}}
 		<form
 			id="searchform"
 			class="w-full font-serif"
 			method="get"
 			action="/suche/baende"
 			autocomplete="off">
+			{{- if not $model.parameters.Extended -}}
 				<div class="searchformcolumn">
 					{{- $q := "" }}
 					{{- if $model.parameters.Query -}}
@@ -164,18 +162,75 @@
 					</fieldset>
 					{{ template "_infotextsimple" true }}
 				</div>
-			</form>
-		{{- end -}}
-	</div>
-</div>
-
 				{{- template "_fieldscript" -}}
+			{{- else -}}
+				<div id="extendedsearchcolumn" class="">
+					<input type="hidden" name="extended" value="true" />
+					<label for="titlestring">Titel</label>
+					<input
+						type="search"
+						name="titlestring"
+						id="titlestring"
+						value="{{ $model.parameters.TitleString }}" />
+					<label for="almstring">Almanach-Nr.</label>
+					<input
+						type="search"
+						name="almstring"
+						id="almstring"
+						value="{{ $model.parameters.AlmString }}" />
+					<label for="seriesstring">Reihentitel</label>
+					<input
+						type="search"
+						name="seriesstring"
+						id="seriesstring"
+						value="{{ $model.parameters.SeriesString }}" />
+					<label for="personsstring">Personen &amp; Verlage</label>
+					<input
+						type="search"
+						name="personsstring"
+						id="personsstring"
+						value="{{ $model.parameters.PersonsString }}" />
+					<label for="placesstring">Orte</label>
+					<input
+						type="search"
+						name="placesstring"
+						id="placesstring"
+						value="{{ $model.parameters.PlacesString }}" />
+					<label for="yearstring">Jahr</label>
+					<input
+						type="search"
+						name="yearstring"
+						id="yearstring"
+						value="{{ $model.parameters.YearString }}" />
+					<label for="refsstring">Nachweise</label>
+					<input
+						type="search"
+						name="refsstring"
+						id="refsstring"
+						value="{{ $model.parameters.RefsString }}" />
+					<label for="annotationsstring">Anmerkungen</label>
+					<input
+						type="search"
+						name="annotationsstring"
+						id="annotationsstring"
+						value="{{ $model.parameters.AnnotationsString }}" />
+					<button id="submitbutton" type="submit" class="">Suchen</button>
+					<a href="/suche/baende" class="whitespace-nowrap"
+						><i class="ri-arrow-left-long-line"></i> Zurück zur einfachen Suche</a
+					>
+				</div>
+			{{- end -}}
+		</form>
+	</div>
+</div>
 
-{{- if $model.parameters.Query -}}
+{{- if $model.parameters.IsBaendeSearch -}}
 	<div class="container-normal" id="searchresults">
 		<div class="border-b border-zinc-300 flex flex-row justify-between">
 			<div>
+				{{ if $model.parameters.Query -}}
 					Suche nach <b>»{{ $model.parameters.Query }}«</b> &middot;
+				{{- end -}}
 				<i class="ri-book-line"></i>
 				{{ if eq $model.result.Count 1 -}}
 					Ein Band
@@ -189,6 +244,7 @@
 					{{ $model.result.Series | len }} Reihen
 				{{- end -}}
 			</div>
+
 			<div>
 				<label
 					for="sort"
@@ -250,7 +306,7 @@
 	let mark_instance = new Mark(elements);
 	// INFO: we wait a little bit before marking, to settle everything
 		setTimeout(() => {
-			mark_instance.mark('{{ $model.parameters.Query }}', {
+			mark_instance.mark('{{ $model.parameters.AllSearchTerms }}', {
 				"seperateWordSearch": true,
 			});
 		}, 200);
@@ -258,6 +314,6 @@
 	</div>
 
 	{{- if not $model.result.Hits -}}
-		Keine Bände gefunden.
+		<div class="container-normal">Keine Bände gefunden.</div>
 	{{- end -}}
 {{- end -}}

views/transform/site.css

@@ -382,4 +382,28 @@
 	input:disabled {
 		@apply italic text-gray-500;
 	}
+
+	#extendedsearchcolumn {
+		@apply grid grid-cols-12 gap-y-3 w-full gap-x-4;
+	}
+
+	#extendedsearchcolumn input {
+		@apply w-full px-2 py-1 border-zinc-600 border col-span-9;
+	}
+
+	#extendedsearchcolumn button {
+		@apply bg-stone-100 text-base px-2.5 py-1 rounded font-sans transition-all duration-75 col-start-4 col-span-4;
+	}
+
+	#extendedsearchcolumn button:hover:not(:disabled) {
+		@apply cursor-pointer bg-stone-200;
+	}
+
+	#extendedsearchcolumn button:disabled {
+		@apply bg-stone-300 text-gray-500 cursor-not-allowed;
+	}
+
+	#extendedsearchcolumn label {
+		@apply col-span-3 bg-stone-200 align-middle px-2.5 text-slate-900 items-center flex text-base;
+	}
 }