]> git.koha-community.org Git - koha.git/log
koha.git
18 years agopossible fix for a bug introduced in the latest series of commits:
kados [Sat, 17 Jun 2006 16:26:32 +0000 (16:26 +0000)]
possible fix for a bug introduced in the latest series of commits:
the new firstsubfield setting was causing MARChtml2xml to completely
mangle the record (as in, no data ended up in the XML). More testing
will reveal whether this is actually a fix for that or not ...

18 years ago*** empty log message ***
kylemhall [Fri, 16 Jun 2006 19:17:11 +0000 (19:17 +0000)]
*** empty log message ***

18 years ago*** empty log message ***
kylemhall [Fri, 16 Jun 2006 18:47:57 +0000 (18:47 +0000)]
*** empty log message ***

18 years agoA few random minor changes to sync npl with default templates
oleonard [Thu, 15 Jun 2006 16:58:17 +0000 (16:58 +0000)]
A few random minor changes to sync npl with default templates

18 years agoSynching with default template
oleonard [Thu, 15 Jun 2006 16:20:30 +0000 (16:20 +0000)]
Synching with default template

18 years agoSome link corrections and other minor changes
oleonard [Thu, 15 Jun 2006 15:40:25 +0000 (15:40 +0000)]
Some link corrections and other minor changes

18 years agoupdated release notes : required perl packages
tipaul [Thu, 15 Jun 2006 15:28:24 +0000 (15:28 +0000)]
updated release notes : required perl packages

18 years agoCatching up with default template
oleonard [Thu, 15 Jun 2006 15:23:12 +0000 (15:23 +0000)]
Catching up with default template

18 years agoAdding bookseller notes management.
hdl [Thu, 15 Jun 2006 09:54:46 +0000 (09:54 +0000)]
Adding bookseller notes management.
Merely a template change + and adding notes fields to Updatesupplier.

18 years agoComprehensive Koha post-installation MARC 21 standard bibliographic framework
thd [Thu, 15 Jun 2006 07:32:28 +0000 (07:32 +0000)]
Comprehensive Koha post-installation MARC 21 standard bibliographic framework
script.

18 years agoJust some little typographic fixes
rangi [Thu, 15 Jun 2006 07:20:43 +0000 (07:20 +0000)]
Just some little typographic fixes

18 years agoMoving MARC editor styles into main stylesheets to allow for alternate color styleshe...
oleonard [Wed, 14 Jun 2006 21:15:11 +0000 (21:15 +0000)]
Moving MARC editor styles into main stylesheets to allow for alternate color stylesheets. Adding styles to fit with changes to addbiblio.tmpl.

18 years agoLots of updates, corrections, and cleanup:
oleonard [Wed, 14 Jun 2006 21:12:27 +0000 (21:12 +0000)]
Lots of updates, corrections, and cleanup:
 * synching some recent changes to default template
 * correction to markup that was preventing cloneTag function from working
 * changing several embedded color specifications to class specifications to allow alternate color stylesheets
 * markup and javascript syntax cleanup

18 years agoTwo new styles to comply with changes to addbiblio.pl script (input field onfocus...
oleonard [Wed, 14 Jun 2006 21:09:20 +0000 (21:09 +0000)]
Two new styles to comply with changes to addbiblio.pl script (input field onfocus color and onblur color)

18 years agoChanging some of the generated markup to use CSS class names instead of hard-coded...
oleonard [Wed, 14 Jun 2006 21:08:20 +0000 (21:08 +0000)]
Changing some of the generated markup to use CSS class names instead of hard-coded color values. This moves color choices into the CSS files for each individual template.

18 years agoMinor correction to prevent javascript error when less than 10 tabs are present
oleonard [Wed, 14 Jun 2006 21:05:59 +0000 (21:05 +0000)]
Minor correction to prevent javascript error when less than 10 tabs are present

18 years agorelease notes for 2.2.6
tipaul [Wed, 14 Jun 2006 16:31:20 +0000 (16:31 +0000)]
release notes for 2.2.6

18 years agomoving some systempreferences to a correct tab (& adding a librarian tab)
tipaul [Wed, 14 Jun 2006 16:08:15 +0000 (16:08 +0000)]
moving some systempreferences to a correct tab (& adding a librarian tab)

18 years agomoving basket links to main page
tipaul [Wed, 14 Jun 2006 15:43:39 +0000 (15:43 +0000)]
moving basket links to main page

18 years agoremove html tags when reporting a value
tipaul [Wed, 14 Jun 2006 15:42:50 +0000 (15:42 +0000)]
remove html tags when reporting a value

18 years agominor graphic change
tipaul [Wed, 14 Jun 2006 15:42:27 +0000 (15:42 +0000)]
minor graphic change

18 years agotweak for MARC showing
tipaul [Wed, 14 Jun 2006 15:42:02 +0000 (15:42 +0000)]
tweak for MARC showing

18 years agominor graphic change in list
tipaul [Wed, 14 Jun 2006 15:41:26 +0000 (15:41 +0000)]
minor graphic change in list

18 years agofixing wrong link
tipaul [Wed, 14 Jun 2006 15:41:02 +0000 (15:41 +0000)]
fixing wrong link

18 years agoadding overdue report link to circ module
tipaul [Wed, 14 Jun 2006 15:40:42 +0000 (15:40 +0000)]
adding overdue report link to circ module

18 years agojust reindenting
tipaul [Wed, 14 Jun 2006 15:39:46 +0000 (15:39 +0000)]
just reindenting

18 years agochanging a check (ge instead of >=), to avoid a warning
tipaul [Wed, 14 Jun 2006 15:38:58 +0000 (15:38 +0000)]
changing a check (ge instead of >=), to avoid a warning

18 years agooups... I forgot to commit this fix for first subfield declaration
tipaul [Wed, 14 Jun 2006 15:38:26 +0000 (15:38 +0000)]
oups... I forgot to commit this fix for first subfield declaration

18 years agobugfix in overdue list
tipaul [Wed, 14 Jun 2006 15:37:46 +0000 (15:37 +0000)]
bugfix in overdue list

18 years agobuilding authorised values to show the values, not the code, in items as well as...
tipaul [Wed, 14 Jun 2006 15:37:19 +0000 (15:37 +0000)]
building authorised values to show the values, not the code, in items as well as in biblios

18 years agoTrying to fix NPL template duplicate field problem. SHOULD be tested
tgarip1957 [Tue, 13 Jun 2006 16:13:43 +0000 (16:13 +0000)]
Trying to fix NPL template duplicate field problem. SHOULD be tested

18 years agoBug fixing : tab navigation didnot work.
hdl [Tue, 13 Jun 2006 13:59:50 +0000 (13:59 +0000)]
Bug fixing : tab navigation didnot work.
BUG TO FIX : when using publication date, if publisheddate is null, will have many ids with null values.

18 years agoAdding publication date to issues arrival. So that two dates can be used.
hdl [Tue, 13 Jun 2006 12:34:15 +0000 (12:34 +0000)]
Adding publication date to issues arrival. So that two dates can be used.

18 years agosimplifying search results so that when multiple items depends on one location and...
hdl [Tue, 13 Jun 2006 09:36:51 +0000 (09:36 +0000)]
simplifying search results so that when multiple items depends on one location and holdingbranch, it is displayed on one line with item counts.
If item count is one AND item is on loan or notforloan, information is displayed.

18 years agoRevised and greatly enlarged to near completion Koha MARC 21 standard
thd [Tue, 13 Jun 2006 02:47:40 +0000 (02:47 +0000)]
Revised and greatly enlarged to near completion Koha MARC 21 standard
bibliographic framework.

18 years ago[IMPORTANT]
tipaul [Mon, 12 Jun 2006 10:33:53 +0000 (10:33 +0000)]
[IMPORTANT]

when cloning a tag, there was a problem to detect the tag change when rebuilding the XML/MARC record :
the test was done on an empty field.
with the new CloneTag sub, this empty field was quite tricky to create on the fly.
so i've added on each subfield a <input name="firstsubfield"> saying wether the subfield is the 1st or not.
Thus, when a tag is cloned, it is cloned properly.

HTML2marc and well as HTML2xml have been modified, but PLEASE DOUBLE CHECK my work

18 years agoUpdating to use new ZOOM API
kados [Sun, 11 Jun 2006 13:50:31 +0000 (13:50 +0000)]
Updating to use new ZOOM API

18 years agoif the check fails (mandatory fields), go back to default cursor
tipaul [Fri, 9 Jun 2006 16:01:46 +0000 (16:01 +0000)]
if the check fails (mandatory fields), go back to default cursor

18 years agoMARC editor continued.
tipaul [Fri, 9 Jun 2006 15:58:09 +0000 (15:58 +0000)]
MARC editor continued.
Thanks to ToinS, the cloneTag & authority popup seems to work perfectly...

18 years agoadding cloneTag sub, to clone a field in javascript.
tipaul [Fri, 9 Jun 2006 14:53:49 +0000 (14:53 +0000)]
adding cloneTag sub, to clone a field in javascript.

18 years ago[IMPORTANT]
tipaul [Fri, 9 Jun 2006 14:29:05 +0000 (14:29 +0000)]
[IMPORTANT]
2 things in this commit
- npl templates worked well for cloneSubfield, default one didn't. I couldn't understand why, so I ported npl template to default & just updated the stylesheet

- npl templates were awfully indented, so I indented them a little bit

- I thought for months that the idea of 10 tabs passed separately was crazy. So I fixed it : now there is just 1 (ONE) tab described in templates, that is looped by BIG_LOOP. The BIG_LOOP is filled by the build_tabs.

Works the same way as previously, except there is just 1 tab described in templates !!!

Things still to do :
- making cloneTag work correctly
- handle authorities popup, that is broken
- handle authorities reporting, that is broken too.

18 years agotemplateEncoding passed to online help as well
tipaul [Wed, 7 Jun 2006 14:50:49 +0000 (14:50 +0000)]
templateEncoding passed to online help as well

18 years ago- fixing a small bug in html2marc, when the 1st subfield of a field was empty, the...
tipaul [Fri, 2 Jun 2006 15:36:18 +0000 (15:36 +0000)]
- fixing a small bug in html2marc, when the 1st subfield of a field was empty, the 2nd could not be filled as the MARC::Field had not been created.

18 years ago- moving active color to grey instead of yellow
tipaul [Fri, 2 Jun 2006 15:32:52 +0000 (15:32 +0000)]
- moving active color to grey instead of yellow
- ******** IMPORTANT *********
if TemplateEncoding system preference is set to iso8859-1, there are a lot of encoding problems : MARC::File::XML don't like it, as MARC::Record is supposed to work in MARC8 or UNICODE.
Thus, it seems that all accents are transformed in the process html => xml => marc.
Thus, i've reintroduced the html => marc behaviour if the TemplateEncoding is set to iso8859-1
(i've fixed the html2marc as joshua proposed previously, fixing a remaining bug)

This solution is a workaround : we will have to find a correct solution for Koha 3.0, to move every Koha to UNICODE and UNICODE only. But for instance, I tried some things but failed. Thust this solution, that works correctly for french libraries and should change nothing for unicode ones.

18 years ago- removing a warning
tipaul [Fri, 2 Jun 2006 15:26:57 +0000 (15:26 +0000)]
- removing a warning
- moving color change on Check to the field itself, not to error$i container. error$i container is now useless and removed.
- changing active color to grey, yellow being for mandatory fields.

18 years agomoving dewey to a varchar
tipaul [Fri, 2 Jun 2006 15:21:40 +0000 (15:21 +0000)]
moving dewey to a varchar

18 years agoMuch better error handling, will now save broken records to a dump
kados [Fri, 26 May 2006 04:17:29 +0000 (04:17 +0000)]
Much better error handling, will now save broken records to a dump
file. Will also display warnings provided by the MARC::Record package

18 years agofixing 'file' option
kados [Thu, 25 May 2006 21:25:12 +0000 (21:25 +0000)]
fixing 'file' option

18 years agoreformatting
kados [Thu, 25 May 2006 21:23:39 +0000 (21:23 +0000)]
reformatting

18 years agoExports bibliographic data from Koha to an ISO2709 or MARCXML file.
kados [Tue, 23 May 2006 18:22:58 +0000 (18:22 +0000)]
Exports bibliographic data from Koha to an ISO2709 or MARCXML file.

OPTIONS:
 -format <format>    MARC, MARCXML [MARC]
 -e <encoding>       MARC-8 or UTF-8 [UTF-8]
 -ignoreerrors       Ignore encoding errors
 -assumeunicode      Assume Unicode when unsure of encoding
 -file <filename>    Filename to store dump [koha.mrc]
 -h                  This file

EXAMPLES:
\$ ./export.pl --format=MARCXML --encoding=UTF-8 -file=2005-05-23-koha.mrc --ignoreerrors

Once I'm able, I'll include unicode support in this script, or if
someone else has time, feel free. I'd suggest using the new code
in MARC::File::XML for dealing with encoding in UNIMARC

18 years agoanother fix ... 'renew all' wasn't linked to the right place.
kados [Tue, 23 May 2006 00:26:00 +0000 (00:26 +0000)]
another fix ... 'renew all' wasn't linked to the right place.

18 years agolink to renewscript was wrong.
kados [Mon, 22 May 2006 19:43:14 +0000 (19:43 +0000)]
link to renewscript was wrong.

18 years agofixing scrolling through pages for results ... it was linking to
kados [Mon, 22 May 2006 19:37:30 +0000 (19:37 +0000)]
fixing scrolling through pages for results ... it was linking to
label-bib-search which doesnt' exist ...

18 years agoadding hint for date format expected
kados [Mon, 22 May 2006 12:24:12 +0000 (12:24 +0000)]
adding hint for date format expected

18 years agochange 'book list' to virtual shelves
kados [Mon, 22 May 2006 12:22:27 +0000 (12:22 +0000)]
change 'book list' to virtual shelves

18 years agoadding 'return' column to circulation screen as requested by WIPO. If this
kados [Mon, 22 May 2006 12:12:29 +0000 (12:12 +0000)]
adding 'return' column to circulation screen as requested by WIPO. If this
is a problem for other libraries we should create a syspref.

18 years agomisspelling ... recieved should be received (i before e except after c)
kados [Sat, 20 May 2006 22:32:39 +0000 (22:32 +0000)]
misspelling ... recieved  should be received (i before e except after c)
and I won't even comment on the script name that's misspelled ;-)

18 years agomisspelling ... recieved should be received (i before e except after c)
kados [Sat, 20 May 2006 22:31:06 +0000 (22:31 +0000)]
misspelling ... recieved  should be received (i before e except after c)

18 years agofix misspelling recieved should be received (i before e except after c )
kados [Sat, 20 May 2006 22:29:54 +0000 (22:29 +0000)]
fix misspelling recieved  should be received  (i before e except after c )

18 years agolanguage fix change waited to waiting
kados [Sat, 20 May 2006 22:24:46 +0000 (22:24 +0000)]
language fix change waited to waiting

18 years agoAdding Hungarian translation for NPL OPAC templates
kados [Sat, 20 May 2006 19:03:54 +0000 (19:03 +0000)]
Adding Hungarian translation for NPL OPAC templates

18 years agoSynching with default template
oleonard [Thu, 18 May 2006 20:23:36 +0000 (20:23 +0000)]
Synching with default template

18 years agoCorrections to fix Bug 1058 (Intranet detail screen does not show lost or cancelled...
oleonard [Thu, 18 May 2006 19:14:10 +0000 (19:14 +0000)]
Corrections to fix Bug 1058 (Intranet detail screen does not show lost or cancelled statuses). Chris's fix got lost statuses to appear. Adding similar fix to show cancelled status.

18 years agofixes a minor plugin bug where position 06 was not getting populated
kados [Fri, 12 May 2006 13:06:00 +0000 (13:06 +0000)]
fixes a minor plugin bug where position 06 was not getting populated
by 'c' if 'c' was selected.

18 years agofixing stats.pl that was not working + updating templates
tipaul [Fri, 12 May 2006 09:35:42 +0000 (09:35 +0000)]
fixing stats.pl that was not working + updating templates

18 years agoadding the starting period even when adding a subscription : it fixes bug 1059 :
tipaul [Fri, 12 May 2006 09:35:09 +0000 (09:35 +0000)]
adding the starting period even when adding a subscription : it fixes bug 1059 :
Subscriptions must be entered in as Vol X No. 1 or issue calculation is incorrect

- doc updated on the wiki
- JOSHUA / KADOS / OWEN / KYLE: be carefull your templates have to be modified

18 years agoadding the starting period even when adding a subscription : it fixes bug 1059 :
tipaul [Fri, 12 May 2006 08:36:05 +0000 (08:36 +0000)]
adding the starting period even when adding a subscription : it fixes bug 1059 :
Subscriptions must be entered in as Vol X No. 1 or issue calculation is incorrect

- doc updated on the wiki
- JOSHUA / KADOS / OWEN / KYLE: be carefull your templates have to be modified

18 years agoFixing item lost problem
rangi [Fri, 12 May 2006 08:17:03 +0000 (08:17 +0000)]
Fixing item lost problem

18 years agoMARC::File::XML switched the API in 0.83, this code updates Koha --
kados [Thu, 11 May 2006 14:55:24 +0000 (14:55 +0000)]
MARC::File::XML switched the API in 0.83, this code updates Koha --
it will break your record editing if you don't upgrade MARC::File::XML
to 0.83 on CPAN.

18 years agoAdding version string
rangi [Thu, 11 May 2006 14:15:51 +0000 (14:15 +0000)]
Adding version string

18 years agoFix for reordering by borrower name not working
rangi [Thu, 11 May 2006 11:31:23 +0000 (11:31 +0000)]
Fix for reordering by borrower name not working
bug 1063

18 years agobugfix for #992 : in suggestion-select, a search is automatically done on the catalog...
tipaul [Tue, 9 May 2006 16:05:01 +0000 (16:05 +0000)]
bugfix for #992 : in suggestion-select, a search is automatically done on the catalogue to find a duplicate.
If there is one, it is shown, and the librarian can "connect" the suggestion to a biblionumber to avoid creating a new biblio in the database

18 years agofix for #975 : renewal of a subscription create a biblio
tipaul [Tue, 9 May 2006 15:09:16 +0000 (15:09 +0000)]
fix for #975 : renewal of a subscription create a biblio

18 years agonew colors stylesheet
kados [Tue, 9 May 2006 08:32:31 +0000 (08:32 +0000)]
new colors stylesheet

18 years agonew stylesheet
kados [Tue, 9 May 2006 08:32:03 +0000 (08:32 +0000)]
new stylesheet

18 years agoSome new item type images to choose from
oleonard [Mon, 8 May 2006 21:00:48 +0000 (21:00 +0000)]
Some new item type images to choose from

18 years agoBug fixing. New 'hide-marc' system preference wasn't working here. Copying over struc...
oleonard [Fri, 28 Apr 2006 18:46:30 +0000 (18:46 +0000)]
Bug fixing. New 'hide-marc' system preference wasn't working here. Copying over structure from CSS template with only minor modifications. Also copying styles from CSS-template stylesheet. That will hopefully make coordinated upgrades a little easier.

18 years agoAdding two new system preferences:
oleonard [Thu, 27 Apr 2006 18:07:40 +0000 (18:07 +0000)]
Adding two new system preferences:

1. opacuserlogin shows/hides login-based features like reserves, private shelves, and login forms. On by default.
2. opacbookbag shows/hides the book bag (biblio basket). On by default.

18 years agoEnabling two new system preferences:
oleonard [Thu, 27 Apr 2006 17:02:20 +0000 (17:02 +0000)]
Enabling two new system preferences:

1. opacuserlogin shows/hides login-based features like reserves, private shelves, and login forms.
2. opacbookbag shows/hides the book bag (biblio basket)

18 years agoHiding option to add to existing virtual shelves if there are no existing virtual...
oleonard [Thu, 27 Apr 2006 16:23:34 +0000 (16:23 +0000)]
Hiding option to add to existing virtual shelves if there are no existing virtual shelves (thanks Chris!)

18 years agoSystem preference 'itemcallnumber' can now accept 2 subfields like 050ab to accommoda...
tgarip1957 [Wed, 26 Apr 2006 16:53:37 +0000 (16:53 +0000)]
System preference 'itemcallnumber' can now accept 2 subfields like 050ab to accommodate for LC callnumbering. Single subfield implementation not affected.

18 years agoI had forgotten to uncomment a line after testing.
thd [Wed, 26 Apr 2006 11:48:46 +0000 (11:48 +0000)]
I had forgotten to uncomment a line after testing.

18 years agoMARC8 to UTF-8 support added without XML problems. Rationalised the variable
thd [Wed, 26 Apr 2006 07:36:12 +0000 (07:36 +0000)]
MARC8 to UTF-8 support added without XML problems.  Rationalised the variable
name used for designating MARC flavour to avoid confusion with character set
encoding.

18 years agoTypo was preventing 'hidelostitems' system preference from being applied.
oleonard [Sat, 22 Apr 2006 14:57:46 +0000 (14:57 +0000)]
Typo was preventing 'hidelostitems' system preference from being applied.

** HOWEVER! ** The 'hidelostitems' system preference (now that it's working) seems to be affecting both the OPAC and the intranet, even though the description of the preference suggests that it affects only the OPAC.

18 years agoAdding opacheader and IntranetBiblioDefaultView system preferences
oleonard [Sat, 22 Apr 2006 13:52:12 +0000 (13:52 +0000)]
Adding opacheader and IntranetBiblioDefaultView system preferences

18 years agoNew alternative color and layout stylesheets
oleonard [Fri, 21 Apr 2006 21:34:14 +0000 (21:34 +0000)]
New alternative color and layout stylesheets

18 years agoAdding 'check all' button in search results for biblio basket
oleonard [Fri, 21 Apr 2006 21:30:22 +0000 (21:30 +0000)]
Adding 'check all' button in search results for biblio basket

18 years agoTrying to better handle clearing of the members block in the masthead
oleonard [Fri, 21 Apr 2006 21:26:19 +0000 (21:26 +0000)]
Trying to better handle clearing of the members block in the masthead

18 years agoUpdating recent acquisitions search form to match current version on opac-main.tmpl
oleonard [Fri, 21 Apr 2006 21:22:59 +0000 (21:22 +0000)]
Updating recent acquisitions search form to match current version on opac-main.tmpl

18 years agoCorrecting missing space
oleonard [Fri, 21 Apr 2006 21:10:49 +0000 (21:10 +0000)]
Correcting missing space

18 years agoAdding two new sysprefs :
hdl [Fri, 21 Apr 2006 08:54:55 +0000 (08:54 +0000)]
Adding two new sysprefs :
- z3950NormalizeAuthor of type YesNo. Set this to yes if you want author field to be filled with authorities fields when importing biblio in z3950
- z3950AuthorAuthfields, free text : type in comma-separated list of fields to search for author names for AuthorNormalization.

Adding a feature on a Z3950 import.
You can now automatically fill author with person name authority contained in the biblio if sysprefs are filled.

18 years agoRemoving 'searchdesc' display since this feature is currently broken.
oleonard [Thu, 20 Apr 2006 21:44:59 +0000 (21:44 +0000)]
Removing 'searchdesc' display since this feature is currently broken.

18 years agoAdding new system preference, IntranetBiblioDefaultView, and necessary changes to...
oleonard [Thu, 20 Apr 2006 21:26:53 +0000 (21:26 +0000)]
Adding new system preference, IntranetBiblioDefaultView, and necessary changes to relevant scripts and templates. Just like the OPAC's BiblioDefaultView preference, this determines which screen the user will see when they click a listing in search results: normal, MARC, or ISBD.

18 years agofix incorrect link to Labels Options
kados [Thu, 20 Apr 2006 14:22:38 +0000 (14:22 +0000)]
fix incorrect link to Labels Options

18 years agoEnabling TemplateEncoding system preference
oleonard [Wed, 19 Apr 2006 18:36:24 +0000 (18:36 +0000)]
Enabling TemplateEncoding system preference

18 years agoEnabling TemplateEncoding system preference
oleonard [Wed, 19 Apr 2006 18:20:19 +0000 (18:20 +0000)]
Enabling TemplateEncoding system preference

18 years agoCorrections to TMPL_VAR's, fixing but 1028
oleonard [Wed, 19 Apr 2006 17:04:06 +0000 (17:04 +0000)]
Corrections to TMPL_VAR's, fixing but 1028

18 years agoFix for Bug 714
oleonard [Wed, 19 Apr 2006 16:49:33 +0000 (16:49 +0000)]
Fix for Bug 714

18 years agoAdding opacheader system preference. Allows libraries to include a custom block of...
oleonard [Wed, 19 Apr 2006 16:22:18 +0000 (16:22 +0000)]
Adding opacheader system preference. Allows libraries to include a custom block of HTML at the head of OPAC templates.

18 years ago'labels remaining' count now works.
sushi [Wed, 19 Apr 2006 05:16:03 +0000 (05:16 +0000)]
'labels remaining' count now works.