fraport/fradrive-old
Archived
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.uniworx.de:fradrive/fradrive

Browse Source
This commit is contained in:
Steffen Jost 2023-06-05 08:08:18 +00:00
commit 3322d965ce
6 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -51,3 +51,4 @@ tunnel.log
**/result **/result
**/result-* **/result-*
.develop.cmd .develop.cmd
/.vscode

2
src/Model/Types/Avs.hs
View File

@ -254,7 +254,7 @@ instance FromJSON AvsLicence where
parseJSON (Number n) | n == 1 = pure AvsLicenceVorfeld -- ordered by occurrence, n==1 is most common case parseJSON (Number n) | n == 1 = pure AvsLicenceVorfeld -- ordered by occurrence, n==1 is most common case
| n == 2 = pure AvsLicenceRollfeld | n == 2 = pure AvsLicenceRollfeld
| n == 0 = pure AvsNoLicence | n == 0 = pure AvsNoLicence
-- | n ==(-1) = pure AvsNoLicenceGuest -- InfoContact may send -1 for Guest unable to obtain a licence {- | n ==(-1) = pure AvsNoLicenceGuest -- InfoContact may send -1 for Guest unable to obtain a licence -}
#ifdef DEVELOPMENT #ifdef DEVELOPMENT
parseJSON invalid = prependFailure "parsing AvsLicence failed, " $ fail $ "expected Int value being 0, 1 or 2. Found " ++ show invalid parseJSON invalid = prependFailure "parsing AvsLicence failed, " $ fail $ "expected Int value being 0, 1 or 2. Found " ++ show invalid
#else #else

2
src/Utils/Avs.hs
View File

@ -101,7 +101,7 @@ splitQuery :: (Wrapped a, Wrapped c, Unwrapped a ~ Set b, Semigroup (Unwrapped c
splitQuery rawQuery q splitQuery rawQuery q
| avsMaxQueryAtOnce >= Set.size s = rawQuery q | avsMaxQueryAtOnce >= Set.size s = rawQuery q
| otherwise = do | otherwise = do
-- $logInfoS "AVS" $ "Splitting large query for input Set " <> tshow (Set.size s) -- would require MonadLogger ClientM -- logInfoS "AVS" $ "Splitting large query for input Set " <> tshow (Set.size s) -- would require MonadLogger ClientM
let (avsid1, avsid2) = Set.splitAt avsMaxQueryAtOnce s let (avsid1, avsid2) = Set.splitAt avsMaxQueryAtOnce s
res1 <- rawQuery $ view _Unwrapped' avsid1 res1 <- rawQuery $ view _Unwrapped' avsid1
res2 <- splitQuery rawQuery $ view _Unwrapped' avsid2 res2 <- splitQuery rawQuery $ view _Unwrapped' avsid2

10
src/Utils/Csv/Mail.hs
View File

@ -56,11 +56,11 @@ recodeCsv encOpts toUser act = fromMaybe act $ do
inp <- C.sinkLazy inp <- C.sinkLazy
inp' <- recode inp inp' <- recode inp
sourceLazy inp' .| act sourceLazy inp' .| act
-- -- | FormatXlsx <- fmt -> do -- | FormatXlsx <- fmt -> do
-- -- inp <- C.sinkLazy -- inp <- C.sinkLazy
-- -- archive <- throwLeft $ Zip.toArchiveOrFail inp -- archive <- throwLeft $ Zip.toArchiveOrFail inp
-- -- archive' <- traverseOf (_zEntries . traverse . _Entrty . _3) recode archive -- archive' <- traverseOf (_zEntries . traverse . _Entrty . _3) recode archive
-- -- sourceLazy (Zip.fromArchive inp') .| act -- sourceLazy (Zip.fromArchive inp') .| act
| otherwise -> act | otherwise -> act
where where