fix sets

Author: sinanatra

package.json

@@ -4,9 +4,9 @@
 	"private": true,
 	"scripts": {
 		"dev": "vite dev",
-		"build": "vite build",
 		"preview": "vite preview",
-		"deploy": "gh-pages -d build -t true",
+		"build": "vite build && touch build/.nojekyll",
+		"deploy": "gh-pages -d build --dotfiles",
 		"check": "svelte-kit sync && svelte-check --tsconfig ./jsconfig.json",
 		"check:watch": "svelte-kit sync && svelte-check --tsconfig ./jsconfig.json --watch",
 		"lint": "prettier --plugin-search-dir . --check . && eslint .",

src/components/GraphSection.svelte

@@ -33,65 +33,49 @@
 		}
 	}
 
+	// Helper to normalize IDs
+	function normalizeId(id) {
+		return id
+			.replace(/\/items\//g, '/resources/')
+			.replace(/\/media\//g, '/resources/')
+			.replace(/\/item_sets\//g, '/resources/');
+	}
+
 	async function openNode(node, index) {
 		resetScroll(index);
 		loadingColumn = true;
 
-		// Remove all elements in $graphSteps after the given index
 		$graphSteps.splice(index, $graphSteps.length - index);
 
 		let columnNodes = $graphSteps.map((obj) => obj.data).flat();
 
-		// const response = await fetch(node.target);
-		// const data = await response.json();
-
-		const data = $db.find(
-			(d) =>
-				d['@id']
-					.replace(/\/items\//, '/resources/')
-					.replace(/\/media\//, '/resources/')
-					.replace(/\/item_sets\//, '/resources/') ===
-				node.target
-					.replace(/\/items\//, '/resources/')
-					.replace(/\/media\//, '/resources/')
-					.replace(/\/item_sets\//, '/resources/')
-		);
+		const data = $db.find((d) => normalizeId(d['@id']) === normalizeId(node.target));
 
 		//Fetch the items in the set // just for omeka s
 		if (data?.['o:items'] && $graphSteps.length == 1) {
 			let setData = [];
 			const items = data['o:items']['@id'];
-			// const responseSet = await fetch(items);
-			// const jsonSet = await responseSet.json();
-
-			// check this
-			const jsonSet = $db.find(
-				(d) =>
-					d['@id']
-						.replace(/\/items\//, '/resources/')
-						.replace(/\/media\//, '/resources/')
-						.replace(/\/item_sets\//, '/resources/') ===
-					node.target
-						.replace(/\/items\//, '/resources/')
-						.replace(/\/media\//, '/resources/')
-						.replace(/\/item_sets\//, '/resources/')
-			);
-
-			jsonSet.forEach((item) => {
-				setData.push(item);
-			});
 
-			// omeka s
+			// Use filter (returns array, even if 0 or 1 elements)
+			const jsonSet = $db.filter((d) => normalizeId(d['@id']) === normalizeId(node.target));
+
+			// Only call forEach if array is non-empty
+			if (Array.isArray(jsonSet) && jsonSet.length) {
+				jsonSet.forEach((item) => {
+					setData.push(item);
+				});
+			}
+
 			let setItems = setData.map((d) => {
 				return {
 					title: d[config.paths.title] || d.data?.['@id'],
 					'@id': d['@id'],
-					thumbnail_display_urls: d[config.paths.img[0]]?.[0]['@id'] || getNestedValue(d, config.paths.img.join('.'))
+					thumbnail_display_urls:
+						d[config.paths.img[0]]?.[0]?.['@id'] || getNestedValue(d, config.paths.img.join('.'))
 				};
 			});
 
-			// add the set to the data
-			data.related = { ...setItems };
+			data.related = setItems;
 		}
 
 		selectedTriplets = await createTriplets([{ data }]);
@@ -103,7 +87,6 @@
 		let newNodes = updateNodes([...defaultNodes, ...columnNodes], selectedTripletsData);
 		let paginate = selectedTripletsData.slice(0, batchSize);
 
-		// Replace the element at the given index with the new data
 		$graphSteps[index] = {
 			id: node.target,
 			data: selectedTripletsData.sort((a, b) => {
@@ -124,6 +107,10 @@
 		$updatePosition = true;
 	}
 
+	function getNestedValue(obj, path) {
+		return path.split('.').reduce((o, key) => (o || {})[key], obj);
+	}
+
 	function updateNodes(nodes, selectedNodes) {
 		return selectedNodes.filter((selectedNode) => {
 			return !nodes.some((node) => {

src/routes/texts/03_Fashion_costume_terminology_en.md

@@ -13,7 +13,7 @@ cover: "https://uclab.fh-potsdam.de/refa-catalog/files/large/0a1096efd3fcd71023f
 In the late 19th century, the publishing couple [Frieda](https://uclab.fh-potsdam.de/refa-catalog/api/resources/18762) (1840-1896) and [Franz von Lipperheide](https://uclab.fh-potsdam.de/refa-catalog/api/resources/9364) (1838-1906) compiled sources on the history and meaning of clothing and thus founded the *[Lipperheide Costume Library](https://uclab.fh-potsdam.de/refa-catalog/api/resources/18717)*. The classifications of *fashion*, *costume (dt. Kostüm)* and *regional dress (dt. Tracht)* used by them are accordingly shaped by the understanding of the time and differ from today's terminology. Thus, the term *costume research* has also changed in consequence and is now called *dress research*, *fashion research* or *vestimentary research*. Depending on the research discipline, the terms are used differently and describe a methodological approach.[^Cf. de Günther 2022, pp. 10-14, Kleiderwechsel 2002, pp. 8-13, Mentges 2015, p. 76, Merseburger 2016, p. 30 and Warschaw 2017.]
 
 ## Fashion
-The etymology of the word *fashion* is still subject to different interpretations today: The derivation from the Latin *Modus*, which changed into *mode* in the French language, is disputed. It is possible that two forms of usage prevailed at the end of the 16th century: the masculine grammatical form *mode* in the sense of moderation, rule and modus, and the grammatically feminine form of *mode*, which stood for contemporary clothing and lifestyle. In its further dissemination in Germany and Italy, it initially finds application in the *Alamodische Bilderbogen*, a courtly entertainment literature that became widespread in Germany after the Thirty Years' War. It is also mentioned around 1620 with the meaning "the custom and dress originating in France". This longing for the fashionable was caricatured in *[Alamodische Blätter](https://uclab.fh-potsdam.de/refa-catalog/api/resources/48313)*[^Cf. Ridikül! 2003, Wolter 2002 and Wolter 2012.]. Subsequently, the word *fashion* became naturalised as the concept of the new and of instantaneous taste.
+The etymology of the word *fashion* is still subject to different interpretations today: The derivation from the Latin *Modus*, which changed into *mode* in the French language, is disputed. It is possible that two forms of usage prevailed at the end of the 16th century: the masculine grammatical form *mode* in the sense of moderation, rule and modus, and the grammatically feminine form of *mode*, which stood for contemporary clothing and lifestyle. In its further dissemination in Germany and Italy, it initially finds application in the *Alamodische Bilderbogen*, a courtly entertainment literature that became widespread in Germany after the Thirty Years' War. It is also mentioned around 1620 with the meaning "the custom and dress originating in France". This longing for the fashionable was caricatured in [Alamodische Blätter](https://uclab.fh-potsdam.de/refa-catalog/api/resources/48313) [^Cf. Ridikül! 2003, Wolter 2002 and Wolter 2012.]. Subsequently, the word *fashion* became naturalised as the concept of the new and of instantaneous taste.
 
 ## Regional dress
 The dictionary by Jacob and Wilhelm Grimm describes the meaning of *[regional costume](http://www.woerterbuchnetz.de/DWB?lemma=tracht)* (dt. Tracht) as "to wear or to be worn". The term regional costume (*Tracht*) was first used in 1497 to describe that which is worn on the body and also the way in which it is worn. The term denotes the clothing of the urban and rural population, as well as the garment worn at work as well as the garments in different professions.[^Jacob and Wilhelm Grimm's definition is far-reaching: it also stands for clerical clothing and distinguishes itself from the term “uniform”, a loan word which has been attested since 1746. Tracht also denotes the distinctive clothing of the different classes. Similarly, Tracht stands for mask and masquerade costume. Finally, the dictionary entry notes that Tracht and Fashion are used synonymously. The entry distinguishes between “die kleidungsart allgemein ohne das Moment des zeitgemäszen“ and “zeitgemäsze kleidungsart, Mode, also tracht heiszt die dem frauenzimmer nach einer jedem Landesart gewöhnliche und übliche mode sich einkleiden und anzuputzt” - “the type of dress in general without the moment of the contemporary” and the “contemporary mode of dress, fashion, cf. tracht means the usual and customary fashion for women to dress according to each national style”. In a figurative sense, it also denotes the attitude, the habitus.]

src/setup.json

@@ -1,7 +1,7 @@
 {
 	"title": "ReFa Reader",
 	"api": "https://uclab.fh-potsdam.de/refa-catalog/api",
-	"local": "db_min.json",
+	"local": "db2.json",
 	"url": "",
 	"paths": {
 		"title": "o:title",

src/utils.js

@@ -7,13 +7,15 @@ export async function extractLinks(markdown, mdData) {
 
 	let match;
 	while ((match = regex.exec(markdown))) {
-		if (match[2].includes('http') && !match[2].includes(config.url)) {
+		if (
+			typeof match[2] === 'string' &&
+			match[2].includes('http') &&
+			!match[2].includes(config.url)
+		) {
 			continue;
 		} else {
 			const label = match[3];
-			const url = decodeURIComponent(match[2]);
-			// const id = url.split("/")[1] || url.split("/")[0];
-			// console.log(label, id, url)
+			const url = decodeURIComponent(match[2] || '');
 
 			links.push({
 				label,
@@ -29,7 +31,9 @@ export async function extractLinks(markdown, mdData) {
 	let parseItems = [...getItemsFromDbById(allUrls, mdData, 'items')];
 
 	for (let i = 0; i < links.length; i++) {
-		const link = links.find((d) => parseItems[i]?.['@id'].includes(d.id));
+		const link = links.find(
+			(d) => typeof parseItems[i]?.['@id'] === 'string' && parseItems[i]['@id'].includes(d.id)
+		);
 		const json = parseItems[i];
 		if (link) {
 			link.uniqueId = newUniqueId();
@@ -40,23 +44,23 @@ export async function extractLinks(markdown, mdData) {
 	return links;
 }
 
-// Accepts both full URLs and Omeka IDs
 function getItemsFromDbById(ids, db, type) {
 	return db.filter((item) => {
 		const itemId = item['@id'];
-		// Check direct match
+
 		if (ids.includes(itemId)) return true;
 
-		// Try replacing /media/, /items/, /item_sets/ to /resources/
 		const normalizedId = itemId
 			?.replace(/\/items\//, '/resources/')
 			?.replace(/\/media\//, '/resources/')
 			?.replace(/\/item_sets\//, '/resources/');
 		if (ids.includes(normalizedId)) return true;
 
-		// Try checking if any provided id matches after normalization
 		return ids.some(
-			(id) => id === itemId || id === normalizedId || itemId.endsWith('/' + id) // e.g. just the numeric part
+			(id) =>
+				id === itemId ||
+				id === normalizedId ||
+				(typeof itemId === 'string' && itemId.endsWith('/' + id))
 		);
 	});
 }
@@ -67,7 +71,8 @@ export async function createTriplets(data) {
 	for (let i = 0; i < data.length; i++) {
 		if (data[i].data) {
 			let jsonLD = data[i].data;
-			let set = data[i].set || null; // omeka-s
+			let set = data[i].set || null;
+			console.log('here', jsonLD);
 			let triplets = parseJSONLD(jsonLD, set);
 
 			allTriplets = [...allTriplets, ...triplets];
@@ -94,13 +99,12 @@ export function parseJSONLD(jsonLD, set) {
 	let triplets = [];
 	let source = jsonLD['@id'];
 
-	// omeka s
 	if (set) {
 		triplets.push({
 			source: set['@id'],
 			target: source,
 			img:
-				jsonLD[config.paths.img[0]]?.[0]['@id'] ||
+				jsonLD[config.paths.img[0]]?.[0]?.['@id'] ||
 				getNestedValue(jsonLD, config.paths.img.join('.')),
 			title: jsonLD[config.title]
 		});
@@ -125,11 +129,11 @@ export function parseJSONLD(jsonLD, set) {
 					.replace(/\/media\//, '/resources/')
 					.replace(/\/item_sets\//, '/resources/');
 
-				const title = obj[config.paths.title] || obj.display_title || obj['@id']; // omeka s
+				const title = obj[config.paths.title] || obj.display_title || obj['@id'];
 				const img =
 					obj?.thumbnail_url ||
 					obj?.[config.paths.img?.[0]]?.[0]?.['@id'] ||
-					getNestedValue(obj, config.paths.img.join('.')); // omeka s
+					getNestedValue(obj, config.paths.img.join('.'));
 
 				let property =
 					obj[config.property]?.replace('_', ' ')?.replace(regex, '') ||
@@ -139,8 +143,6 @@ export function parseJSONLD(jsonLD, set) {
 					(triplet) => triplet.source === source && triplet.target === target
 				);
 
-				// console.log(property)
-
 				if (!exists && !config.hideProperties.includes(property)) {
 					triplets.push({
 						source: source,
@@ -149,7 +151,7 @@ export function parseJSONLD(jsonLD, set) {
 						img,
 						property,
 						reverse,
-						external: target.includes(config.url) ? false : true
+						external: typeof target === 'string' && target.includes(config.url) ? false : true
 					});
 				}
 			} else if (typeof obj[key] === 'object') {
@@ -175,25 +177,25 @@ export function parseJSONLD(jsonLD, set) {
 export function getNestedValue(obj, path) {
 	return path.split('.').reduce((o, key) => (o || {})[key], obj);
 }
+
 export function getItemThumbnail(item, allEntities, preferredSize = 'large') {
-  if (!item) return null;
-  
-  // Direct: sometimes image is in the item
-  if (item.thumbnail_display_urls && item.thumbnail_display_urls[preferredSize]) {
-    return item.thumbnail_display_urls[preferredSize];
-  }
-
-  // Or in o:media
-  const mediaArr = item['o:media'];
-  if (!mediaArr || !mediaArr.length) return null;
-
-  for (let mediaRef of mediaArr) {
-    // Find media entity
-    let mediaObj = allEntities.find(ent => ent['@id'] === mediaRef['@id'] || ent['o:id'] === mediaRef['o:id']);
-    if (mediaObj?.thumbnail_display_urls && mediaObj.thumbnail_display_urls[preferredSize]) {
-      return mediaObj.thumbnail_display_urls[preferredSize];
-    }
-  }
-
-  return null;
+	if (!item) return null;
+
+	if (item.thumbnail_display_urls && item.thumbnail_display_urls[preferredSize]) {
+		return item.thumbnail_display_urls[preferredSize];
+	}
+
+	const mediaArr = item['o:media'];
+	if (!mediaArr || !mediaArr.length) return null;
+
+	for (let mediaRef of mediaArr) {
+		let mediaObj = allEntities.find(
+			(ent) => ent['@id'] === mediaRef['@id'] || ent['o:id'] === mediaRef['o:id']
+		);
+		if (mediaObj?.thumbnail_display_urls && mediaObj.thumbnail_display_urls[preferredSize]) {
+			return mediaObj.thumbnail_display_urls[preferredSize];
+		}
+	}
+
+	return null;
 }

static/db2.json

@@ -7,24 +7,22 @@ const dev = process.argv.includes('dev');
 /** @type {import('@sveltejs/kit').Config} */
 const config = {
 	extensions: ['.svelte', ...mdsvexConfig.extensions],
-	preprocess: [
-		mdsvex(mdsvexConfig)
-	],
+	preprocess: [mdsvex(mdsvexConfig)],
 	kit: {
 		adapter: adapter({
 			fallback: '404.html'
 		}),
 		paths: {
-			base: dev ? '' : process.env.BASE_PATH,
+			base: dev ? '' : process.env.BASE_PATH
 		},
 		alias: {
 			'@components': 'src/components',
 			'@stores': 'src/stores.js',
 			'@db': 'src/lib/db.js',
 			'@utils': 'src/utils.js',
-			'@setup': 'src/setup.json',
+			'@setup': 'src/setup.json'
 		}
 	}
 };
 
-export default config;
+export default config;