# # ChangeLog for / # # Generated by Trac 1.4.2 # 2024-06-04T13:22:31+12:00 Tue, 15 Jul 2008 22:28:10 GMT kjdon [16417] * gsdl/trunk/collect/modelcol/import (added) added the import folder back in as we always need it in a new collection Tue, 15 Jul 2008 04:51:40 GMT ak19 [16416] * greenstone3/trunk/web/WEB-INF/cgi/gsdl3site.cfg (modified) Introduction of optional property gsdl3home. If not specified this ... Tue, 15 Jul 2008 04:35:38 GMT ak19 [16415] * greenstone3/trunk/web/WEB-INF/cgi/gliserver.pl (modified) * greenstone3/trunk/web/WEB-INF/cgi/gsdlCGI.pm (modified) Introduced GSDL3HOME variable for the case where a GS3server is remote Tue, 15 Jul 2008 04:01:46 GMT ak19 [16414] * gsdl/trunk/perllib/plugouts/FedoraMETSPlugout.pm (modified) Slightly better way of dealing with GSDL3HOME not being set in the ... Tue, 15 Jul 2008 03:47:05 GMT mdewsnip [16413] * indexers/trunk/lucene-gs (modified) Now ignores the classes directory. Tue, 15 Jul 2008 03:45:21 GMT mdewsnip [16412] * indexers/trunk/lucene-gs/Makefile (modified) * indexers/trunk/lucene-gs/lib/lucene-core-2.0.0.jar (deleted) * indexers/trunk/lucene-gs/lib/lucene-core-2.3.2.jar (added) Upgraded from Lucene 2.0.0 to Lucene 2.3.2, mainly to get the ... Tue, 15 Jul 2008 03:41:56 GMT ak19 [16411] * gsdl/trunk/perllib/plugouts/FedoraMETSPlugout.pm (modified) Correction to previous 'bugfix' which was actually a mistake. Use of ... Tue, 15 Jul 2008 03:09:36 GMT mdewsnip [16410] * gsdl/trunk/packages/wget (modified) Changed ignore property. Tue, 15 Jul 2008 02:22:36 GMT davidb [16409] * greenstone3/trunk/web/ui/skins/oran/xsl/siteHome.xsl (moved) In fixing case sensitivity on filename fixed, got filename extension ... Tue, 15 Jul 2008 02:19:49 GMT davidb [16408] * greenstone3/trunk/web/ui/skins/oran/xsl/siteHome.xml (moved) Case sensitivity on filename fixed Tue, 15 Jul 2008 01:13:16 GMT ak19 [16407] * gsdl/trunk/perllib/g2futil.pm (modified) Corrected change made yesterday: dealing with the undefined case (as ... Tue, 15 Jul 2008 00:46:50 GMT ak19 [16406] * gsdl/trunk/perllib/g2futil.pm (modified) fedora_client_bin is added to PATH using the util package, since it ... Tue, 15 Jul 2008 00:20:55 GMT ak19 [16405] * greenstone3/trunk/web/WEB-INF/cgi/gliserver.pl (modified) * greenstone3/trunk/web/WEB-INF/cgi/gsdlCGI.pm (modified) Minor. Now tests for matches using m/something/ rather than /something/ Tue, 15 Jul 2008 00:10:30 GMT ak19 [16404] * gsdl/trunk/perllib/util.pm (modified) Subroutines envvar_prepend and envvar_append now only append a new ... Mon, 14 Jul 2008 08:13:55 GMT ak19 [16403] * gli/trunk/client-fli.bat (added) New windows script to launch FLI as client of a remote Greenstone ... Mon, 14 Jul 2008 08:12:42 GMT ak19 [16402] * gli/trunk/fli.bat (modified) Introduced new flag -fedora that helps with launching FLI in both ... Mon, 14 Jul 2008 08:12:04 GMT ak19 [16401] * gli/trunk/client-gli.bat (modified) Merged client-gli4gs3.bat into client-gli.bat so that client-gli.bat ... Mon, 14 Jul 2008 07:46:21 GMT ak19 [16400] * gli/trunk/src/org/greenstone/gatherer/gui/CreatePane.java (modified) Checking canDoScheduling() before trying to do buildSchedule stuff Mon, 14 Jul 2008 07:44:01 GMT ak19 [16399] * gli/trunk/src/org/greenstone/gatherer/collection/CollectionManager.java (modified) Making canDoScheduling() a static public method Mon, 14 Jul 2008 07:41:21 GMT ak19 [16398] * gsdl/trunk/perllib/g2futil.pm (modified) Need to take into account that catalina_home is undefined for gs2, ... Mon, 14 Jul 2008 04:25:22 GMT ak19 [16397] * gli/trunk/src/org/greenstone/gatherer/Gatherer.java (modified) Minor change. Mon, 14 Jul 2008 03:24:30 GMT ak19 [16396] * gsdl/trunk/perllib/plugouts/FedoraMETSPlugout.pm (modified) Bugfix that caused ingest to fail in GS3 remote cases but (for some ... Mon, 14 Jul 2008 03:21:19 GMT ak19 [16395] * gsdl/trunk/perllib/g2futil.pm (modified) 1. For Fedora CATALINA_HOME ought to be its own tomcat, but When ... Mon, 14 Jul 2008 03:02:15 GMT ak19 [16394] * greenstone3/trunk/web/WEB-INF/cgi/gsdl3site.cfg (modified) javahome is optional for GS3, since the path would contain this ... Mon, 14 Jul 2008 02:59:17 GMT kjdon [16393] * gsdl/trunk/collect/demo/etc/collect.cfg (modified) updated the plugin names Mon, 14 Jul 2008 02:57:38 GMT kjdon [16392] * gsdl/trunk/perllib/plugins/ArchivesInfPlugin.pm (modified) * gsdl/trunk/perllib/plugins/CONTENTdmPlugin.pm (modified) * gsdl/trunk/perllib/plugins/ConvertBinaryFile.pm (modified) * gsdl/trunk/perllib/plugins/ConvertToRogPlugin.pm (modified) * gsdl/trunk/perllib/plugins/DBPlugin.pm (modified) * gsdl/trunk/perllib/plugins/DSpacePlugin.pm (modified) * gsdl/trunk/perllib/plugins/FOXPlugin.pm (modified) * gsdl/trunk/perllib/plugins/GMLPlugin.pm (modified) * gsdl/trunk/perllib/plugins/HBPlugin.pm (modified) * gsdl/trunk/perllib/plugins/HTMLPlugin.pm (modified) * gsdl/trunk/perllib/plugins/ISISPlugin.pm (modified) * gsdl/trunk/perllib/plugins/IndexPlugin.pm (modified) * gsdl/trunk/perllib/plugins/LOMPlugin.pm (modified) * gsdl/trunk/perllib/plugins/MP3Plugin.pm (modified) * gsdl/trunk/perllib/plugins/OAIPlugin.pm (modified) * gsdl/trunk/perllib/plugins/OggVorbisPlugin.pm (modified) * gsdl/trunk/perllib/plugins/OpenDocumentPlugin.pm (modified) * gsdl/trunk/perllib/plugins/ReadTextFile.pm (modified) * gsdl/trunk/perllib/plugins/ReadXMLFile.pm (modified) * gsdl/trunk/perllib/plugins/RealMediaPlugin.pm (modified) * gsdl/trunk/perllib/plugins/RogPlugin.pm (modified) * gsdl/trunk/perllib/plugins/SplitTextFile.pm (modified) * gsdl/trunk/perllib/plugins/UnknownPlugin.pm (modified) * gsdl/trunk/perllib/plugins/W3ImagePlugin.pm (modified) * gsdl/trunk/perllib/plugins/ZIPPlugin.pm (modified) global block pass: read_block is no more, use can_process_this_file ... Mon, 14 Jul 2008 02:56:43 GMT kjdon [16391] * gsdl/trunk/perllib/plugins/DirectoryPlugin.pm (modified) global block pass: this plugin now does the blocking - when reading ... Mon, 14 Jul 2008 02:54:58 GMT kjdon [16390] * gsdl/trunk/perllib/plugins/BasePlugin.pm (modified) global block pass: read_block is no more. blockign done in a first ... Mon, 14 Jul 2008 02:51:21 GMT ak19 [16389] * gsdl/trunk/cgi-bin/gsdlsite.cfg (modified) JAVA_HOME and FEDORA_HOME (as well as the version of Fedora used) ... Mon, 14 Jul 2008 02:45:28 GMT kjdon [16388] * gsdl/trunk/perllib/plugins/AbstractPlugin.pm (modified) global block pass: added in empty file_block_read method Mon, 14 Jul 2008 02:45:18 GMT ak19 [16387] * greenstone3/trunk/web/WEB-INF/cgi/gsdl3site.cfg (modified) Introduced optional fedorahome and fedoraversion variables Mon, 14 Jul 2008 02:43:50 GMT kjdon [16386] * gsdl/trunk/perllib/plugins/MetadataCSVPlugin.pm (modified) * gsdl/trunk/perllib/plugins/MetadataXMLPlugin.pm (modified) global block pass: now uses process_exp instead of block_exp. during ... Mon, 14 Jul 2008 02:41:00 GMT ak19 [16385] * greenstone3/trunk/web/WEB-INF/cgi/gsdlCGI.pm (modified) Processes new fedorahome and fedoraversion variables if these have ... Mon, 14 Jul 2008 02:40:51 GMT kjdon [16384] * gsdl/trunk/perllib/plugins/PagedImagePlugin.pm (modified) global block pass: new block_hash arg to read and metadata_read. Also ... Mon, 14 Jul 2008 02:39:51 GMT kjdon [16383] * gsdl/trunk/perllib/plugins/ImagePlugin.pm (modified) make sure filename is in utf8 before calling generate_images Mon, 14 Jul 2008 02:38:47 GMT kjdon [16382] * gsdl/trunk/perllib/plugins/ImageConverter.pm (modified) filename_no_path arg to generate_images must now be in utf8, and then ... Mon, 14 Jul 2008 02:37:01 GMT kjdon [16381] * gsdl/trunk/perllib/plugin.pm (modified) global block pass: added in plugin:file_block_read, which is the ... Mon, 14 Jul 2008 02:35:40 GMT kjdon [16380] * gsdl/trunk/perllib/util.pm (modified) added two methods, get_full_filenames (which used to be in ... Mon, 14 Jul 2008 02:34:23 GMT kjdon [16379] * gsdl/trunk/perllib/basebuilder.pm (modified) * gsdl/trunk/perllib/lucenebuilder.pm (modified) * gsdl/trunk/perllib/mgbuilder.pm (modified) * gsdl/trunk/perllib/mgppbuilder.pm (modified) global block pass: added in extra argument to plugin::read calls Mon, 14 Jul 2008 02:32:27 GMT kjdon [16378] * gsdl/trunk/bin/script/checkwritability.bat (modified) * gsdl/trunk/bin/script/delcol.pl (modified) * gsdl/trunk/bin/script/exportcol.pl (modified) * gsdl/trunk/bin/script/extract_text.pl (modified) I think I set these files to be executables Mon, 14 Jul 2008 02:32:09 GMT kjdon [16377] * gsdl/trunk/bin/script/import.pl (modified) added in global blocking pass, and now must pass a block hash to ... Mon, 14 Jul 2008 02:27:24 GMT ak19 [16376] * greenstone3/trunk/web/WEB-INF/cgi/gliserver.pl (modified) Outputs FEDORA_HOME env vars if any are set Mon, 14 Jul 2008 01:22:59 GMT kjdon [16375] * gsdl/trunk/perllib/multiread.pm (modified) need no strict refs for isisplugin Mon, 14 Jul 2008 00:10:15 GMT davidb [16374] * greenstone3/trunk/src/java/org/greenstone/gsdl3/LibraryServlet.java (modified) * greenstone3/trunk/src/java/org/greenstone/gsdl3/core/Receptionist.java (modified) * greenstone3/trunk/src/java/org/greenstone/gsdl3/core/Skin.java (modified) * greenstone3/trunk/src/java/org/greenstone/gsdl3/core/SkinnedReceptionist.java (modified) * greenstone3/trunk/src/java/org/greenstone/gsdl3/core/TransformingReceptionist.java (modified) * greenstone3/trunk/src/java/org/greenstone/gsdl3/util/XMLConverter.java (modified) Change to Skin code (returning Node note Element) so XSLT encodes its ... Mon, 14 Jul 2008 00:07:36 GMT davidb [16373] * greenstone3/trunk/web/ui/xslt/preProcess.xsl (moved) Renaming of file to case-sensitive version. Original commit from ... Mon, 14 Jul 2008 00:06:53 GMT davidb [16372] * greenstone3/trunk/web/ui/skins/oran/xsl/collectBrowse.xsl (moved) * greenstone3/trunk/web/ui/skins/oran/xsl/collectDocument.xsl (moved) * greenstone3/trunk/web/ui/skins/oran/xsl/collectDocument2.xsl (moved) * greenstone3/trunk/web/ui/skins/oran/xsl/collectHome.xsl (moved) Renaming of file to case-sensitive version. Original commit from ... Sun, 13 Jul 2008 23:24:18 GMT ak19 [16371] * gli/trunk/src/org/greenstone/gatherer/remote/RemoteGreenstoneServer.java (modified) RemoteGreenstoneServer Authentication method no longer prefills ... Fri, 11 Jul 2008 16:53:55 GMT osborn [16370] * gsdl/trunk/bin/script/schedule.pl (modified) Minor fixes Fri, 11 Jul 2008 07:23:53 GMT ak19 [16369] * gli/trunk/src/org/greenstone/gatherer/gui/FedoraLogin.java (modified) Made the login button the default button (activated on pressing ... Fri, 11 Jul 2008 05:42:15 GMT ak19 [16368] * gli/trunk/client-gli.sh (modified) Client-gli.sh now works for both GS2 and GS3. It also works with ... Fri, 11 Jul 2008 05:06:24 GMT ak19 [16367] * gli/trunk/client-fli.sh (modified) Removed CLIENT progmode environment variable Fri, 11 Jul 2008 05:01:48 GMT ak19 [16366] * gli/trunk/fli.sh (modified) Introduced -fedora flag into fli.sh since that is now already ... Fri, 11 Jul 2008 05:00:18 GMT ak19 [16365] * gli/trunk/client-fli.sh (modified) Introduced -fedora flag into fli.sh since that is now already ... Fri, 11 Jul 2008 03:18:27 GMT ak19 [16364] * gsdl/trunk/bin/script/g2f-import.pl (modified) Cosmetic changes: added the ampersand in front of package subroutine ... Fri, 11 Jul 2008 03:17:34 GMT ak19 [16363] * gsdl/trunk/perllib/g2futil.pm (modified) Minor changes to output text Fri, 11 Jul 2008 03:16:16 GMT ak19 [16362] * greenstone3/trunk/web/WEB-INF/cgi/gliserver.pl (modified) Changes for when client FLI runs against a remote GS server and ... Fri, 11 Jul 2008 03:13:38 GMT ak19 [16361] * gli/trunk/src/org/greenstone/gatherer/util/StaticStrings.java (modified) New static string for when client FLI runs against a remote GS server ... Fri, 11 Jul 2008 03:12:57 GMT ak19 [16360] * gli/trunk/src/org/greenstone/gatherer/GetOpt.java (modified) Changes for when client FLI runs against a remote GS server and ... Fri, 11 Jul 2008 03:11:04 GMT ak19 [16359] * gli/trunk/src/org/greenstone/gatherer/FedoraInfo.java (modified) Changes for when client FLI runs against a remote GS server and ... Fri, 11 Jul 2008 03:06:10 GMT ak19 [16358] * gli/trunk/src/org/greenstone/gatherer/Gatherer.java (modified) Changes for when client FLI runs against a remote GS server and ... Fri, 11 Jul 2008 02:57:32 GMT kjdon [16357] * gsdl/trunk/bin/script/mkcol.pl (modified) * gsdl/trunk/collect/modelcol/etc/collectionConfig.xml (modified) removed smart_block from default HTMLPlug options Thu, 10 Jul 2008 22:39:25 GMT davidb [16356] * gsdl/trunk/WIN32cfg.h (deleted) Renaming of WIN32cfg.h to win32cfg.h Thu, 10 Jul 2008 22:20:17 GMT kjdon [16355] * greenstone3/trunk/src/java/org/greenstone/gsdl3/service/GS2MGPPRetrieve.java (modified) * greenstone3/trunk/src/java/org/greenstone/gsdl3/service/PhindPhraseBrowse.java (modified) MGPPRetrieveWrapper no longer has an UnloadIndexData method Thu, 10 Jul 2008 22:15:34 GMT kjdon [16354] * indexers/trunk/mgpp/jni/win32.mak (modified) tidied up to reflect no more MGPPWrapper Thu, 10 Jul 2008 22:11:07 GMT oranfry [16353] * indexers/trunk/mg/lib/huffman.h (modified) * indexers/trunk/mgpp/lib/huffman.h (modified) fixing a compile problem on mac: it complains that there was no such ... Thu, 10 Jul 2008 22:06:55 GMT kjdon [16352] * indexers/trunk/mgpp/jni/org_greenstone_mgpp_MGPPWrapper.h (deleted) no longer needed Thu, 10 Jul 2008 22:06:17 GMT kjdon [16351] * indexers/trunk/mgpp/jni/org_greenstone_mgpp_MGPPRetrieveWrapper.h (modified) updated jni header for previous changes Thu, 10 Jul 2008 22:05:25 GMT oranfry [16350] * gsdl/trunk/packages/xlhtml/xlhtml-0.4.9.0-gs.tar.gz (modified) unpacked the xlhtml tar, ran autoconf on it, tarred it back up. this ... Thu, 10 Jul 2008 22:03:44 GMT kjdon [16349] * indexers/trunk/mgpp/java/org/greenstone/mgpp/MGPPRetrieveWrapper.java (modified) * indexers/trunk/mgpp/java/org/greenstone/mgpp/MGPPWrapper.java (deleted) * indexers/trunk/mgpp/java/org/greenstone/mgpp/Makefile.in (modified) * indexers/trunk/mgpp/java/org/greenstone/mgpp/Queryer.java (modified) * indexers/trunk/mgpp/jni/MGPPRetrieveWrapperImpl.cpp (modified) * indexers/trunk/mgpp/jni/MGPPSearchWrapperImpl.cpp (modified) * indexers/trunk/mgpp/jni/MGPPSearchWrapperImpl.h (added) * indexers/trunk/mgpp/jni/MGPPWrapperImpl.cpp (deleted) * indexers/trunk/mgpp/jni/MGPPWrapperImpl.h (deleted) deleted the old MGPPWrapper stuff (java and jni sides) and tidied up ... Thu, 10 Jul 2008 21:15:15 GMT kjdon [16348] * indexers/trunk/mgpp/java/org/greenstone/mgpp/Queryer.java (modified) indented the code with smaller indents in preparation for some ... Thu, 10 Jul 2008 02:46:12 GMT davidb [16347] * gsdl/trunk/src/recpt/maincfg.cpp (modified) Tidying up of some of the use of filename_cat Thu, 10 Jul 2008 02:41:25 GMT anna [16346] * documentation/trunk/manuals/xml-source/en/Install_en.xml (modified) Added a subsection about installing Greenstone on Vista. Thu, 10 Jul 2008 02:41:03 GMT kjdon [16345] * gsdl/branches/2.80-fixed/perllib/plugins/EMAILPlug.pm (modified) save attachments in binary mode so they work on windows. Use ... Thu, 10 Jul 2008 02:37:22 GMT oranfry [16344] * gsdl/branches/2.80-fixed (copied) a place to put patches for 2.80 Thu, 10 Jul 2008 02:31:39 GMT ak19 [16343] * gli/trunk/client-gli4gs3.bat (modified) Intermediate file to keep client-gli working. Now this file works for ... Thu, 10 Jul 2008 02:29:02 GMT ak19 [16342] * gli/trunk/client-gli4gs3.sh (modified) Intermediate file to keep client-gli working. Now this file works for ... Thu, 10 Jul 2008 02:26:51 GMT kjdon [16341] * gsdl/trunk/perllib/plugins/EmailPlugin.pm (modified) save attachments in binary mode so they work on windows. Use ... Thu, 10 Jul 2008 02:20:57 GMT ak19 [16340] * gli/trunk/classes/xml/config.xml (modified) * gli/trunk/classes/xml/configRemote.xml (modified) * gli/trunk/classes/xml/fedora-config.xml (modified) * gli/trunk/classes/xml/fedora-configRemote.xml (modified) Since config files for GS3 are now merged into those of Greenstone 2 ... Thu, 10 Jul 2008 02:13:51 GMT davidb [16339] * gsdl/trunk/perllib/dbutil.pm (modified) Added quotes around exec of 'txt2db' so it will work from within a ... Thu, 10 Jul 2008 01:42:34 GMT ak19 [16338] * gli/trunk/src/org/greenstone/gatherer/gui/URLField.java (modified) Completely changed in order to still work with WarningDialog but now ... Thu, 10 Jul 2008 01:36:30 GMT ak19 [16337] * gli/trunk/src/org/greenstone/gatherer/gui/FedoraLogin.java (modified) Changed to let user-provided Fedora connection details be written ... Thu, 10 Jul 2008 01:31:54 GMT ak19 [16336] * gli/trunk/src/org/greenstone/gatherer/gui/GUIManager.java (modified) Lets GLI main window display server version number at the top Thu, 10 Jul 2008 01:30:55 GMT ak19 [16335] * gli/trunk/src/org/greenstone/gatherer/gui/WarningDialog.java (modified) Value_field is now a JComponent rather than a JTextField, since ... Thu, 10 Jul 2008 01:20:24 GMT ak19 [16334] * gli/trunk/src/org/greenstone/gatherer/remote/RemoteGreenstoneServer.java (modified) Three changes: 1. Added method and corresponding Action class to get ... Thu, 10 Jul 2008 01:10:29 GMT anna [16333] * gli/trunk/src/org/greenstone/gatherer/gui/HelpFrame.java (modified) By default GLI Help reads the index files (table of content) from ... Thu, 10 Jul 2008 01:04:28 GMT davidb [16332] * gsdl/trunk/win32cfg.h (copied) Renaming of WIN32cfg.h to win32cfg.h so Windows can still correctly ... Thu, 10 Jul 2008 00:56:42 GMT ak19 [16331] * gli/trunk/src/org/greenstone/gatherer/util/XMLTools.java (modified) Fixed a bug in showXMLParseFailureLine() and it now informs the ... Thu, 10 Jul 2008 00:53:51 GMT ak19 [16330] * gli/trunk/src/org/greenstone/gatherer/Configuration.java (modified) Changes to work with the remote GS server which now knows its server ... Thu, 10 Jul 2008 00:26:44 GMT ak19 [16329] * gli/trunk/src/org/greenstone/gatherer/Gatherer.java (modified) Changes to work with the remote GS server knowing the server version ... Wed, 09 Jul 2008 23:58:36 GMT ak19 [16328] * gli/trunk/classes/dictionary.properties (modified) Providing the GLI server URL is compulsory now when launching client- ... Wed, 09 Jul 2008 23:48:54 GMT ak19 [16327] * greenstone3/trunk/web/WEB-INF/cgi/gsdlCGI.pm (modified) Minor changes to better work with Windows (preview ... Wed, 09 Jul 2008 23:15:53 GMT ak19 [16326] * greenstone3/trunk/web/WEB-INF/cgi/gliserver.pl (modified) Calls to execute java nested inside quotes in case the path to java ... Wed, 09 Jul 2008 21:59:14 GMT kjdon [16325] * gsdl/trunk/win32.mak (modified) changed the command for copying the exe files into bin\windows, ... Wed, 09 Jul 2008 21:20:00 GMT kjdon [16324] * gsdl/trunk/bin/script/mkcol.pl (modified) set default value to win31compat option to false Wed, 09 Jul 2008 11:14:33 GMT davidb [16323] * gsdl/trunk/src/recpt/Makefile.in (modified) Added GSDL libraries to library dependencies, so 'library' is now ... Wed, 09 Jul 2008 10:49:18 GMT davidb [16322] * indexers/trunk/mgpp/text/win32.mak (modified) Tweaked clean target to do a better job at deleting compiled .obj, ... Wed, 09 Jul 2008 09:32:22 GMT davidb [16321] * gsdl/trunk/src/recpt/configaction.cpp (modified) Introduction of 'collecthome' to support collections outside of ... Wed, 09 Jul 2008 08:18:54 GMT davidb [16320] * gsdl/trunk/src/w32server/cgiwrapper.cpp (modified) Introduction of 'collecthome' to support collections outside of the ... Wed, 09 Jul 2008 05:52:48 GMT davidb [16319] * greenstone3/trunk/web/WEB-INF/web.xml (modified) Adding the "dev" servlet (skin++ prototype) Wed, 09 Jul 2008 05:44:06 GMT davidb [16318] * greenstone3/trunk/web/sites/localsite/metadata.xml (added) Merging of skin work with the main trunk