Diff of /pkg/R/corpus.R

Parent Directory | Revision Log | Patch

	revision 744, Mon Apr 23 00:35:10 2007 UTC	revision 747, Fri Apr 27 18:16:53 2007 UTC
#	Line 43	Line 43
43	if (dbControl$useDb) {	if (dbControl$useDb) {
44	dbInsert(db, "DMetaData", df)	dbInsert(db, "DMetaData", df)
45	dmeta.df <- data.frame(key = "DMetaData", subset = I(list(NA)))	dmeta.df <- data.frame(key = "DMetaData", subset = I(list(NA)))
	dbDisconnect(db)
46	}	}
47	else	else
48	dmeta.df <- df	dmeta.df <- df
#	Line 145	Line 144
144	db[[id]] <- FUN(object[[i]], ..., DMetaData = DMetaData(object))	db[[id]] <- FUN(object[[i]], ..., DMetaData = DMetaData(object))
145	i <- i + 1	i <- i + 1
146	}	}
	dbDisconnect(db)
147	}	}
148	else	else
149	result@.Data <- lapply(object, FUN, ..., DMetaData = DMetaData(object))	result@.Data <- lapply(object, FUN, ..., DMetaData = DMetaData(object))
#	Line 285	Line 283
283	if (dbExists(db, ID(data)))	if (dbExists(db, ID(data)))
284	warning("document with identical ID already exists")	warning("document with identical ID already exists")
285	dbInsert(db, ID(data), data)	dbInsert(db, ID(data), data)
	dbDisconnect(db)
286	object@.Data[[length(object)+1]] <- ID(data)	object@.Data[[length(object)+1]] <- ID(data)
287	}	}
288	else	else
#	Line 378	Line 375
375	}	}
376	counter <- counter + 1	counter <- counter + 1
377	}	}
	dbDisconnect(db)
378	}	}
379	else	else
380	object@.Data[i, ...] <- value	object@.Data[i, ...] <- value
#	Line 391	Line 387
387	if (DBControl(x)[["useDb"]]) {	if (DBControl(x)[["useDb"]]) {
388	db <- dbInit(DBControl(x)[["dbName"]], DBControl(x)[["dbType"]])	db <- dbInit(DBControl(x)[["dbName"]], DBControl(x)[["dbType"]])
389	result <- dbFetch(db, x@.Data[[i]])	result <- dbFetch(db, x@.Data[[i]])
	dbDisconnect(db)
390	return(loadDoc(result))	return(loadDoc(result))
391	}	}
392	else	else
#	Line 406	Line 401
401	db <- dbInit(DBControl(object)[["dbName"]], DBControl(object)[["dbType"]])	db <- dbInit(DBControl(object)[["dbName"]], DBControl(object)[["dbType"]])
402	index <- object@.Data[[i]]	index <- object@.Data[[i]]
403	db[[index]] <- value	db[[index]] <- value
	dbDisconnect(db)
404	}	}
405	else	else
406	object@.Data[[i, ...]] <- value	object@.Data[[i, ...]] <- value
#	Line 576	Line 570
570	if (DBControl(object)[["useDb"]]) {	if (DBControl(object)[["useDb"]]) {
571	db <- dbInit(DBControl(object)[["dbName"]], DBControl(object)[["dbType"]])	db <- dbInit(DBControl(object)[["dbName"]], DBControl(object)[["dbType"]])
572	show(dbMultiFetch(db, unlist(object)))	show(dbMultiFetch(db, unlist(object)))
	dbDisconnect(db)
573	}	}
574	else	else
575	show(object@.Data)	show(object@.Data)
#	Line 590	Line 583
583	if (DBControl(y)[["useDb"]]) {	if (DBControl(y)[["useDb"]]) {
584	db <- dbInit(DBControl(y)[["dbName"]], DBControl(y)[["dbType"]])	db <- dbInit(DBControl(y)[["dbName"]], DBControl(y)[["dbType"]])
585	result <- any(sapply(y, function(x, z) {x %in% Corpus(z)}, x))	result <- any(sapply(y, function(x, z) {x %in% Corpus(z)}, x))
	dbDisconnect(db)
586	}	}
587	else	else
588	result <- x %in% y	result <- x %in% y
#	Line 603	Line 595
595	if (DBControl(X)[["useDb"]]) {	if (DBControl(X)[["useDb"]]) {
596	db <- dbInit(DBControl(X)[["dbName"]], DBControl(X)[["dbType"]])	db <- dbInit(DBControl(X)[["dbName"]], DBControl(X)[["dbType"]])
597	result <- lapply(dbMultiFetch(db, unlist(X)), FUN, ...)	result <- lapply(dbMultiFetch(db, unlist(X)), FUN, ...)
	dbDisconnect(db)
598	}	}
599	else	else
600	result <- base::lapply(X, FUN, ...)	result <- base::lapply(X, FUN, ...)
#	Line 616	Line 607
607	if (DBControl(X)[["useDb"]]) {	if (DBControl(X)[["useDb"]]) {
608	db <- dbInit(DBControl(X)[["dbName"]], DBControl(X)[["dbType"]])	db <- dbInit(DBControl(X)[["dbName"]], DBControl(X)[["dbType"]])
609	result <- sapply(dbMultiFetch(db, unlist(X)), FUN, ...)	result <- sapply(dbMultiFetch(db, unlist(X)), FUN, ...)
	dbDisconnect(db)
610	}	}
611	else	else
612	result <- base::sapply(X, FUN, ...)	result <- base::sapply(X, FUN, ...)

---

Colored Diff Long Colored Diff Unidiff Context Diff Side by Side

Legend: Removed from v.744   changed lines   Added in v.747

---

root@r-forge.r-project.org	ViewVC Help
Powered by ViewVC 1.0.0